diff --git a/client.txt b/client.txt
index 1f1d2d7..635a01d 100644
--- a/client.txt
+++ b/client.txt
@@ -2114,25 +2114,25 @@ com.mojang.realmsclient.RealmsMainScreen -> dhv:
     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
+    1297:1297:boolean isSelfOwnedServer(com.mojang.realmsclient.dto.RealmsServer) -> h
+    1301:1301:boolean isSelfOwnedNonExpiredServer(com.mojang.realmsclient.dto.RealmsServer) -> i
+    1305:1312:void drawExpired(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> c
+    1315:1334:void drawExpiring(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int) -> b
+    1337:1344:void drawOpen(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> d
+    1347:1354:void drawClose(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> e
+    1357:1372:void drawLeave(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> f
+    1375:1390:void drawConfigure(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> g
+    1393:1421:void renderMousehoverTooltip(com.mojang.blaze3d.vertex.PoseStack,java.util.List,int,int) -> a
+    1424:1438:void renderMoreInfo(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,boolean) -> a
+    1441:1468:void renderNews(com.mojang.blaze3d.vertex.PoseStack,int,int,boolean,int,int,boolean,boolean) -> a
+    1471:1483:void renderLocal(com.mojang.blaze3d.vertex.PoseStack) -> b
+    1486:1498:void renderStage(com.mojang.blaze3d.vertex.PoseStack) -> c
+    1501:1503:com.mojang.realmsclient.RealmsMainScreen newScreen() -> g
+    1513:1515:void updateTeaserImages(net.minecraft.server.packs.resources.ResourceManager) -> a
+    1518:1519:void setTooltip(net.minecraft.network.chat.Component[]) -> a
+    1543:1544:void pendingButtonPress(net.minecraft.client.gui.components.Button) -> a
+    1514:1514:boolean lambda$updateTeaserImages$13(net.minecraft.resources.ResourceLocation) -> a
+    1513:1513: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
@@ -2258,13 +2258,13 @@ com.mojang.realmsclient.RealmsMainScreen$5 -> dhv$5:
     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
-    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
+    1585:1587:void <init>(com.mojang.realmsclient.RealmsMainScreen) -> <init>
+    1591:1599:void renderButton(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> b
+    1586:1586: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
-    1109:1109:void <init>(com.mojang.realmsclient.RealmsMainScreen) -> <init>
-    1109:1109:void <init>(com.mojang.realmsclient.RealmsMainScreen,com.mojang.realmsclient.RealmsMainScreen$1) -> <init>
+    1112:1112:void <init>(com.mojang.realmsclient.RealmsMainScreen) -> <init>
+    1112:1112: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
@@ -2277,15 +2277,15 @@ com.mojang.realmsclient.RealmsMainScreen$HoveredElement -> dhv$c:
     136:140:void <clinit>() -> <clinit>
 com.mojang.realmsclient.RealmsMainScreen$NewsButton -> dhv$d:
     com.mojang.realmsclient.RealmsMainScreen this$0 -> a
-    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
+    1547:1563:void <init>(com.mojang.realmsclient.RealmsMainScreen) -> <init>
+    1567:1568:void renderButton(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> b
+    1549:1561: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
-    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
+    1526:1528:void <init>(com.mojang.realmsclient.RealmsMainScreen) -> <init>
+    1532:1533:void tick() -> d
+    1537:1538:void renderButton(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> b
+    1527:1527: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
@@ -2296,33 +2296,33 @@ com.mojang.realmsclient.RealmsMainScreen$RealmSelectionList -> dhv$f:
     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
+    1053:1060:void setSelected(com.mojang.realmsclient.RealmsMainScreen$Entry) -> b
+    1064:1099:void itemClicked(int,int,double,double,int) -> a
+    1103:1103:int getMaxPosition() -> c
+    1108:1108: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
-    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
+    1157:1159:void <init>(com.mojang.realmsclient.RealmsMainScreen,com.mojang.realmsclient.dto.RealmsServer) -> <init>
+    1163:1164:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    1168:1174:boolean mouseClicked(double,double,int) -> a
+    1178:1179:void renderMcoServerItem(com.mojang.realmsclient.dto.RealmsServer,com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> a
+    1182:1293:void renderLegacy(com.mojang.realmsclient.dto.RealmsServer,com.mojang.blaze3d.vertex.PoseStack,int,int,int,int) -> b
+    1289:1292:void lambda$renderLegacy$0(com.mojang.blaze3d.vertex.PoseStack,int,int) -> a
+    1152:1152: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
-    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
+    1572:1576:void <init>(com.mojang.realmsclient.RealmsMainScreen) -> <init>
+    1580:1581:void renderButton(com.mojang.blaze3d.vertex.PoseStack,int,int,float) -> b
+    1574:1574: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>
+    1115:1115:void <init>(com.mojang.realmsclient.RealmsMainScreen) -> <init>
+    1118:1119:void render(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int,int,int,boolean,float) -> a
+    1123:1124:boolean mouseClicked(double,double,int) -> a
+    1128:1149:void renderTrialItem(com.mojang.blaze3d.vertex.PoseStack,int,int,int,int,int) -> a
+    1115:1115: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
@@ -4109,7 +4109,7 @@ com.mojang.realmsclient.gui.screens.RealmsUploadScreen -> dkm:
     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>
+    60: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
@@ -4121,14 +4121,14 @@ com.mojang.realmsclient.gui.screens.RealmsUploadScreen -> dkm:
     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
+    256:390:void upload() -> l
+    393:394:void setErrorMessage(net.minecraft.network.chat.Component[]) -> a
+    397:399:void uploadCancelled() -> m
+    402:402:boolean verify(java.io.File) -> a
+    406:418:java.io.File tarGzipArchive(java.io.File) -> b
+    422:444:void addFileToTarGz(org.apache.commons.compress.archivers.tar.TarArchiveOutputStream,java.lang.String,java.lang.String,boolean) -> a
+    259:389:void lambda$upload$4() -> n
+    338:350: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
diff --git a/src/com/mojang/realmsclient/RealmsMainScreen.java b/src/com/mojang/realmsclient/RealmsMainScreen.java
index d42226e..6bcf9b5 100644
--- a/src/com/mojang/realmsclient/RealmsMainScreen.java
+++ b/src/com/mojang/realmsclient/RealmsMainScreen.java
@@ -1138,9 +1138,12 @@ public class RealmsMainScreen extends RealmsScreen {
         @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);
+            final int integer3 = this.children().indexOf(b);
+            if (!this.showingMessage || integer3 > 0) {
+                final RealmsServer dip4 = RealmsMainScreen.this.realmsServers.get(integer3 - (this.showingMessage ? 1 : 0));
+                RealmsMainScreen.this.selectedServerId = dip4.id;
+                RealmsMainScreen.this.updateButtonStates(dip4);
+            }
         }
         
         @Override
diff --git a/src/com/mojang/realmsclient/gui/screens/RealmsUploadScreen.java b/src/com/mojang/realmsclient/gui/screens/RealmsUploadScreen.java
index e61bd0a..23da478 100644
--- a/src/com/mojang/realmsclient/gui/screens/RealmsUploadScreen.java
+++ b/src/com/mojang/realmsclient/gui/screens/RealmsUploadScreen.java
@@ -34,10 +34,10 @@ import com.mojang.blaze3d.vertex.Tesselator;
 import com.mojang.blaze3d.systems.RenderSystem;
 import java.util.Locale;
 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.network.chat.TranslatableComponent;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.network.chat.Component;
 import com.google.common.util.concurrent.RateLimiter;
@@ -73,6 +73,7 @@ public class RealmsUploadScreen extends RealmsScreen {
     private final Runnable callback;
     
     public RealmsUploadScreen(final long long1, final int integer, final RealmsResetWorldScreen dke, final LevelSummary daf, final Runnable runnable) {
+        this.status = new TranslatableComponent("mco.upload.preparing");
         this.showDots = true;
         this.worldId = long1;
         this.slotId = integer;
@@ -269,8 +270,10 @@ public class RealmsUploadScreen extends RealmsScreen {
             dia3 = RealmsClient.create();
             long4 = this.worldId;
             try {
-                if (!(!RealmsUploadScreen.UPLOAD_LOCK.tryLock(1L, TimeUnit.SECONDS))) {
-                    this.status = new TranslatableComponent("mco.upload.preparing");
+                if (!RealmsUploadScreen.UPLOAD_LOCK.tryLock(1L, TimeUnit.SECONDS)) {
+                    this.status = new TranslatableComponent("mco.upload.close.failure");
+                }
+                else {
                     dja6 = null;
                     integer7 = 0;
                     while (integer7 < 20) {
diff --git a/src/net/minecraft/DetectedVersion.java b/src/net/minecraft/DetectedVersion.java
index cd8d9a8..31b43bf 100644
--- a/src/net/minecraft/DetectedVersion.java
+++ b/src/net/minecraft/DetectedVersion.java
@@ -28,13 +28,13 @@ public class DetectedVersion implements GameVersion {
     
     private DetectedVersion() {
         this.id = UUID.randomUUID().toString().replaceAll("-", "");
-        this.name = "1.16";
+        this.name = "1.16.1";
         this.stable = true;
-        this.worldVersion = 2566;
-        this.protocolVersion = 735;
+        this.worldVersion = 2567;
+        this.protocolVersion = 736;
         this.packVersion = 5;
         this.buildTime = new Date();
-        this.releaseTarget = "1.16";
+        this.releaseTarget = "1.16.1";
     }
     
     private DetectedVersion(final JsonObject jsonObject) {
diff --git a/src/net/minecraft/client/resources/ClientPackSource.java b/src/net/minecraft/client/resources/ClientPackSource.java
index 60da057..a8d7e42 100644
--- a/src/net/minecraft/client/resources/ClientPackSource.java
+++ b/src/net/minecraft/client/resources/ClientPackSource.java
@@ -1,5 +1,7 @@
 java.lang.StackOverflowError
-	at cuchaz.enigma.NoRetryMetadataSystem.resolveType(NoRetryMetadataSystem.java:21)
+	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)
 	at com.strobel.assembler.metadata.MetadataResolver.resolve(MetadataResolver.java:104)
 	at cuchaz.enigma.NoRetryMetadataSystem.resolve(NoRetryMetadataSystem.java:36)
@@ -1021,5 +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)
diff --git a/src/net/minecraft/data/loot/BlockLoot.java b/src/net/minecraft/data/loot/BlockLoot.java
index cb80c46..0e92ef4 100644
--- a/src/net/minecraft/data/loot/BlockLoot.java
+++ b/src/net/minecraft/data/loot/BlockLoot.java
@@ -1,4 +1,6 @@
 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)
@@ -1021,5 +1023,3 @@ 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/gametest/framework/GameTestRunner.java b/src/net/minecraft/gametest/framework/GameTestRunner.java
index 90afa23..81680bd 100644
--- a/src/net/minecraft/gametest/framework/GameTestRunner.java
+++ b/src/net/minecraft/gametest/framework/GameTestRunner.java
@@ -1,7 +1,4 @@
 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)
@@ -1023,3 +1020,6 @@ 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/server/level/ChunkMap.java b/src/net/minecraft/server/level/ChunkMap.java
index 368eaa5..89b555e 100644
--- a/src/net/minecraft/server/level/ChunkMap.java
+++ b/src/net/minecraft/server/level/ChunkMap.java
@@ -7,9 +7,6 @@ java.lang.StackOverflowError
 	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)
@@ -1023,3 +1020,6 @@ 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)
diff --git a/src/net/minecraft/util/datafix/fixes/ItemStackUUIDFix.java b/src/net/minecraft/util/datafix/fixes/ItemStackUUIDFix.java
index 257ffe4..656d3bf 100644
--- a/src/net/minecraft/util/datafix/fixes/ItemStackUUIDFix.java
+++ b/src/net/minecraft/util/datafix/fixes/ItemStackUUIDFix.java
@@ -26,12 +26,8 @@ java.lang.StackOverflowError
 	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.addCastForAssignment(InsertNecessaryConversionsTransform.java:265)
+	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)
@@ -1023,3 +1019,7 @@ 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)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
diff --git a/src/net/minecraft/util/datafix/fixes/LeavesFix.java b/src/net/minecraft/util/datafix/fixes/LeavesFix.java
index bd9ebd7..6ae2418 100644
--- a/src/net/minecraft/util/datafix/fixes/LeavesFix.java
+++ b/src/net/minecraft/util/datafix/fixes/LeavesFix.java
@@ -1,6 +1,4 @@
 java.lang.StackOverflowError
-	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)
@@ -13,8 +11,12 @@ java.lang.StackOverflowError
 	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.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)
@@ -1021,5 +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)
diff --git a/src/net/minecraft/util/datafix/fixes/SwimStatsRenameFix.java b/src/net/minecraft/util/datafix/fixes/SwimStatsRenameFix.java
index 314fb09..008a400 100644
--- a/src/net/minecraft/util/datafix/fixes/SwimStatsRenameFix.java
+++ b/src/net/minecraft/util/datafix/fixes/SwimStatsRenameFix.java
@@ -1,14 +1,6 @@
 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.isRawType(MetadataHelper.java:1581)
-	at com.strobel.decompiler.languages.java.utilities.RedundantCastUtility$IsRedundantVisitor.isTypeCastSemantic(RedundantCastUtility.java:1068)
+	at com.strobel.decompiler.languages.java.ast.CastExpression.getExpression(CastExpression.java:46)
+	at com.strobel.decompiler.languages.java.utilities.RedundantCastUtility$IsRedundantVisitor.isTypeCastSemantic(RedundantCastUtility.java:978)
 	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)
@@ -1023,3 +1015,11 @@ 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)
+	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)
diff --git a/src/net/minecraft/world/entity/LivingEntity.java b/src/net/minecraft/world/entity/LivingEntity.java
index d3016c6..e9ebe30 100644
--- a/src/net/minecraft/world/entity/LivingEntity.java
+++ b/src/net/minecraft/world/entity/LivingEntity.java
@@ -1,10 +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)
-	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.CoreMetadataFactory$UnresolvedType.accept(CoreMetadataFactory.java:577)
@@ -1023,3 +1017,9 @@ 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)
+	at com.strobel.decompiler.languages.java.ast.transforms.InsertNecessaryConversionsTransform.visitReturnStatement(InsertNecessaryConversionsTransform.java:222)
diff --git a/src/net/minecraft/world/level/levelgen/placement/CountHeighmapDoubleDecorator.java b/src/net/minecraft/world/level/levelgen/placement/CountHeighmapDoubleDecorator.java
index 80c20fd..5dd7ee0 100644
--- a/src/net/minecraft/world/level/levelgen/placement/CountHeighmapDoubleDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/CountHeighmapDoubleDecorator.java
@@ -1,17 +1,19 @@
 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$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)
@@ -1021,5 +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)
diff --git a/src/net/minecraft/world/level/levelgen/placement/CountHeightmap32Decorator.java b/src/net/minecraft/world/level/levelgen/placement/CountHeightmap32Decorator.java
index 346d870..15bb1dc 100644
--- a/src/net/minecraft/world/level/levelgen/placement/CountHeightmap32Decorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/CountHeightmap32Decorator.java
@@ -1,45 +1,37 @@
 java.lang.StackOverflowError
-	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$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.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: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$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.TypeDefinition.accept(TypeDefinition.java:183)
+	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.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.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.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)
@@ -1023,3 +1015,11 @@ 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)
diff --git a/src/net/minecraft/world/level/levelgen/placement/NoiseHeightmapDoubleDecorator.java b/src/net/minecraft/world/level/levelgen/placement/NoiseHeightmapDoubleDecorator.java
index 52d4fbf..8908557 100644
--- a/src/net/minecraft/world/level/levelgen/placement/NoiseHeightmapDoubleDecorator.java
+++ b/src/net/minecraft/world/level/levelgen/placement/NoiseHeightmapDoubleDecorator.java
@@ -1,17 +1,19 @@
 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$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)
@@ -1021,5 +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)