diff --git a/javascript/classes.js b/javascript/classes.js
index 17316df..df8dcbf 100644
--- a/javascript/classes.js
+++ b/javascript/classes.js
@@ -1185,8 +1185,8 @@ function nle_Client_main($args) {
         maan_Instrument__clinit_();
         nms_WorldType__clinit_();
         nms_EnumGameType__clinit_();
-        nms_ScoreObjectiveCriteria__clinit_();
         nms_GuiWinGame__clinit_();
+        nms_ScoreObjectiveCriteria__clinit_();
         nms_GuiMerchant__clinit_();
         nms_GuiChest__clinit_();
         nms_GuiCrafting__clinit_();
@@ -1202,8 +1202,8 @@ function nle_Client_main($args) {
         nms_EnumCreatureAttribute__clinit_();
         nms_EntityFootStepFX__clinit_();
         nms_EntityLargeExplodeFX__clinit_();
-        nms_GuiButtonMerchant__clinit_();
         nms_GuiBeaconButton__clinit_();
+        nms_GuiButtonMerchant__clinit_();
         nms_GuiScreenBook__clinit_();
         nms_GuiButtonNextPage__clinit_();
         nle_Client_registerErrorHandler$js_body$_5();
@@ -2144,8 +2144,8 @@ function otp_Platform_prepareNewInstance() {
     nms_GameRules[c] = nms_GameRules__init_;
     jn_InvalidMarkException[c] = jn_InvalidMarkException__init_;
     nms_GuiWinGame[c] = nms_GuiWinGame__init_;
-    nms_WorldProviderSurface[c] = nms_WorldProviderSurface__init_;
     nms_MerchantRecipeList[c] = nms_MerchantRecipeList__init_;
+    nms_WorldProviderSurface[c] = nms_WorldProviderSurface__init_;
     nms_WorldProviderHell[c] = nms_WorldProviderHell__init_;
     nms_WorldProviderEnd[c] = nms_WorldProviderEnd__init_;
     nms_InventoryEnderChest[c] = nms_InventoryEnderChest__init_;
@@ -56371,9 +56371,6 @@ function jn_IntBufferOverByteBufferBigEndian_putElement($this, $index, $value) {
 function cbpc_IEND() {
     cbpc_Chunk.call(this);
 }
-function cbpc_IDAT() {
-    cbpc_Chunk.call(this);
-}
 function cbpc_PLTE() {
     cbpc_Chunk.call(this);
     this.$color = null;
@@ -56401,6 +56398,9 @@ function cbpc_PLTE_build($this) {
 function cbpc_PLTE_getColor($this, $i) {
     return $this.$color.data[$i];
 }
+function cbpc_IDAT() {
+    cbpc_Chunk.call(this);
+}
 function jl_Double() {
     jl_Number.call(this);
     this.$value6 = 0.0;
@@ -65699,6 +65699,7 @@ var maa_NoteblockPlayer_instruments = null;
 var maa_NoteblockPlayer_startingPos = null;
 var maa_NoteblockPlayer_mc = null;
 var maa_NoteblockPlayer_legit = 0;
+var maa_NoteblockPlayer_flying = 0;
 var maa_NoteblockPlayer_playingSong = 0;
 var maa_NoteblockPlayer_songLiness = null;
 var maa_NoteblockPlayer_instrNoteToBlocks = null;
@@ -65731,6 +65732,8 @@ function maa_NoteblockPlayer_tick() {
     main: while (true) { switch ($ptr) {
     case 0:
         maa_NoteblockPlayer_$callClinit();
+        if (maa_NoteblockPlayer_flying)
+            maa_NoteblockPlayer_mc.$thePlayer.$capabilities.$isFlying = 1;
         if (maa_NoteblockPlayer_playing && maa_NoteblockPlayer_playingSong) {
             $linesPlayed = 0;
             var$2 = maa_NoteblockPlayer_songLiness.data;
@@ -65749,10 +65752,10 @@ function maa_NoteblockPlayer_tick() {
                 $blockPos = $blockPos === null ? null : $blockPos.$value0;
                 try {
                     var$11 = maa_NoteblockPlayer_mc.$playerController;
-                    $instr = $blockPos.$xCoord | 0;
-                    $note = $blockPos.$yCoord - 1.0 | 0;
-                    $tick = $blockPos.$zCoord | 0;
-                    var$12 = 1;
+                    var$12 = $blockPos.$xCoord | 0;
+                    $instr = $blockPos.$yCoord - 1.0 | 0;
+                    $note = $blockPos.$zCoord | 0;
+                    $tick = 1;
                     $ptr = 1;
                     continue main;
                 } catch ($$e) {
@@ -65773,7 +65776,7 @@ function maa_NoteblockPlayer_tick() {
     case 1:
         a: {
             try {
-                nms_PlayerControllerMP_clickBlock(var$11, $instr, $note, $tick, var$12);
+                nms_PlayerControllerMP_clickBlock(var$11, var$12, $instr, $note, $tick);
                 if ($rt_suspending()) {
                     break main;
                 }
@@ -65805,10 +65808,10 @@ function maa_NoteblockPlayer_tick() {
             $blockPos = $blockPos === null ? null : $blockPos.$value0;
             try {
                 var$11 = maa_NoteblockPlayer_mc.$playerController;
-                $instr = $blockPos.$xCoord | 0;
-                $note = $blockPos.$yCoord - 1.0 | 0;
-                $tick = $blockPos.$zCoord | 0;
-                var$12 = 1;
+                var$12 = $blockPos.$xCoord | 0;
+                $instr = $blockPos.$yCoord - 1.0 | 0;
+                $note = $blockPos.$zCoord | 0;
+                $tick = 1;
                 continue main;
             } catch ($$e) {
                 $$je = $rt_wrapException($$e);
@@ -68541,6 +68544,7 @@ function maa_NoteblockPlayer__clinit_() {
     maa_NoteblockPlayer_startingPos = null;
     maa_NoteblockPlayer_mc = nmc_Minecraft_theMinecraft;
     maa_NoteblockPlayer_legit = 0;
+    maa_NoteblockPlayer_flying = 0;
     maa_NoteblockPlayer_playingSong = 0;
     maa_NoteblockPlayer_songLiness = null;
     maa_NoteblockPlayer_instrNoteToBlocks = null;
@@ -116095,6 +116099,42 @@ function nms_EntityOtherPlayerMP_setCurrentItemOrArmor($this, $par1, $par2ItemSt
 function nms_EntityOtherPlayerMP_getEyeHeight($this) {
     return 1.8200000524520874;
 }
+function nms_PlayerCapabilities() {
+    var a = this; jl_Object.call(a);
+    a.$disableDamage = 0;
+    a.$isFlying = 0;
+    a.$allowFlying = 0;
+    a.$isCreativeMode = 0;
+    a.$allowEdit = 0;
+    a.$flySpeed = 0.0;
+    a.$walkSpeed = 0.0;
+}
+function nms_PlayerCapabilities__init_0() {
+    var var_0 = new nms_PlayerCapabilities();
+    nms_PlayerCapabilities__init_(var_0);
+    return var_0;
+}
+function nms_PlayerCapabilities__init_($this) {
+    $this.$disableDamage = 0;
+    $this.$isFlying = 0;
+    $this.$allowFlying = 0;
+    $this.$isCreativeMode = 0;
+    $this.$allowEdit = 1;
+    $this.$flySpeed = 0.05000000074505806;
+    $this.$walkSpeed = 0.10000000149011612;
+}
+function nms_PlayerCapabilities_getFlySpeed($this) {
+    return $this.$flySpeed;
+}
+function nms_PlayerCapabilities_setFlySpeed($this, $par1) {
+    $this.$flySpeed = $par1;
+}
+function nms_PlayerCapabilities_getWalkSpeed($this) {
+    return $this.$walkSpeed;
+}
+function nms_PlayerCapabilities_setPlayerWalkSpeed($this, $par1) {
+    $this.$walkSpeed = $par1;
+}
 function nms_Vec3() {
     var a = this; jl_Object.call(a);
     a.$myVec3LocalPool = null;
@@ -117393,42 +117433,6 @@ function nms_ItemStack_setRepairCost($this, $par1) {
     var$2.$data2 = $par1;
     ju_HashMap_putImpl(var$3, $rt_s(1592), var$2);
 }
-function nms_PlayerCapabilities() {
-    var a = this; jl_Object.call(a);
-    a.$disableDamage = 0;
-    a.$isFlying = 0;
-    a.$allowFlying = 0;
-    a.$isCreativeMode = 0;
-    a.$allowEdit = 0;
-    a.$flySpeed = 0.0;
-    a.$walkSpeed = 0.0;
-}
-function nms_PlayerCapabilities__init_0() {
-    var var_0 = new nms_PlayerCapabilities();
-    nms_PlayerCapabilities__init_(var_0);
-    return var_0;
-}
-function nms_PlayerCapabilities__init_($this) {
-    $this.$disableDamage = 0;
-    $this.$isFlying = 0;
-    $this.$allowFlying = 0;
-    $this.$isCreativeMode = 0;
-    $this.$allowEdit = 1;
-    $this.$flySpeed = 0.05000000074505806;
-    $this.$walkSpeed = 0.10000000149011612;
-}
-function nms_PlayerCapabilities_getFlySpeed($this) {
-    return $this.$flySpeed;
-}
-function nms_PlayerCapabilities_setFlySpeed($this, $par1) {
-    $this.$flySpeed = $par1;
-}
-function nms_PlayerCapabilities_getWalkSpeed($this) {
-    return $this.$walkSpeed;
-}
-function nms_PlayerCapabilities_setPlayerWalkSpeed($this, $par1) {
-    $this.$walkSpeed = $par1;
-}
 function nms_Block() {
     var a = this; jl_Object.call(a);
     a.$displayOnCreativeTab = null;
@@ -158047,9 +158051,9 @@ function jur_Pattern_split($this, $inputSeq, $limit) {
 function jur_Pattern_split0($this, $input) {
     return jur_Pattern_split($this, $input, 0);
 }
-function jur_Pattern_pattern($this) {
+$java.jur_Pattern_pattern = function($this) {
     return $this.$lexemes.$orig;
-}
+};
 function jur_Pattern_compile($pattern, $flags) {
     var var$3;
     if ($pattern === null) {
@@ -158921,9 +158925,9 @@ $java.jur_Pattern_processRangeExpression = function($this, $alt) {
                 }
                 $firstInClass = 0;
             }
-            $rt_throw($java.jur_PatternSyntaxException__init_($rt_s(44), jur_Pattern_pattern($this), $java.jur_Lexer_getIndex($this.$lexemes)));
+            $rt_throw($java.jur_PatternSyntaxException__init_($rt_s(44), $java.jur_Pattern_pattern($this), $java.jur_Lexer_getIndex($this.$lexemes)));
         }
-        $rt_throw($java.jur_PatternSyntaxException__init_($rt_s(44), jur_Pattern_pattern($this), $java.jur_Lexer_getIndex($this.$lexemes)));
+        $rt_throw($java.jur_PatternSyntaxException__init_($rt_s(44), $java.jur_Pattern_pattern($this), $java.jur_Lexer_getIndex($this.$lexemes)));
     }
     if (!$notClosed) {
         if ($buffer >= 0)
@@ -190879,8 +190883,12 @@ $java.maa_GuiScreenModules_actionPerformed = function($this, $par1GuiButton) {
                     if ($par1GuiButton.$id2 == 3) {
                         maa_NoteblockPlayer_$callClinit();
                         maa_NoteblockPlayer_legit = maa_NoteblockPlayer_legit ? 0 : 1;
-                    } else if ($par1GuiButton.$id2 == 4)
-                        $this.$mc4.$thePlayer.$capabilities.$isFlying = $this.$mc4.$thePlayer.$capabilities.$isFlying ? 0 : 1;
+                    } else if ($par1GuiButton.$id2 == 4) {
+                        maa_NoteblockPlayer_$callClinit();
+                        maa_NoteblockPlayer_flying = maa_NoteblockPlayer_flying ? 0 : 1;
+                        if (!maa_NoteblockPlayer_flying)
+                            $this.$mc4.$thePlayer.$capabilities.$isFlying = 0;
+                    }
                 } else {
                     maa_NoteblockPlayer_$callClinit();
                     if (!maa_NoteblockPlayer_playing) {
@@ -207861,311 +207869,27 @@ function nms_EntitySenses_clearSensingCache($this) {
 function cjj_GZIPInputStream() {
     cjj_InflaterInputStream.call(this);
 }
-function nms_WorldProviderSurface() {
-    nms_WorldProvider.call(this);
-}
-$java.nms_WorldProviderSurface__init_ = function() {
-    var var_0 = new nms_WorldProviderSurface();
-    nms_WorldProviderSurface__init_(var_0);
-    return var_0;
-};
-function nms_WorldProviderSurface__init_($this) {
-    $this.$isHellWorld = 0;
-    $this.$hasNoSky = 0;
-    $this.$lightBrightnessTable = $rt_createFloatArray(16);
-    $this.$dimensionId = 0;
-    $this.$colorsSunriseSunset = $rt_createFloatArray(4);
-}
-$java.nms_WorldSettings = function() {
+$java.nms_NpcMerchant = function() {
     var a = this; jl_Object.call(a);
-    a.$seed0 = Long_ZERO;
-    a.$theGameType = null;
-    a.$mapFeaturesEnabled = 0;
-    a.$hardcoreEnabled = 0;
-    a.$terrainType2 = null;
-    a.$commandsAllowed = 0;
-    a.$field_82751_h = null;
+    a.$theMerchantInventory = null;
+    a.$customer = null;
+    a.$recipeList = null;
 };
-$java.nms_WorldSettings_getSeed = function($this) {
-    return $this.$seed0;
+$java.nms_NpcMerchant_getCustomer = function($this) {
+    return $this.$customer;
 };
-$java.nms_WorldSettings_getGameType = function($this) {
-    return $this.$theGameType;
-};
-$java.nms_WorldSettings_getHardcoreEnabled = function($this) {
-    return $this.$hardcoreEnabled;
-};
-$java.nms_WorldSettings_isMapFeaturesEnabled = function($this) {
-    return $this.$mapFeaturesEnabled;
-};
-$java.nms_WorldSettings_getTerrainType = function($this) {
-    return $this.$terrainType2;
-};
-$java.nms_WorldSettings_areCommandsAllowed = function($this) {
-    return $this.$commandsAllowed;
-};
-$java.nms_WorldSettings_func_82749_j = function($this) {
-    return $this.$field_82751_h;
-};
-$java.nms_GuiDownloadTerrain = function() {
-    var a = this; nms_GuiScreen.call(a);
-    a.$netHandler = null;
-    a.$updateCounter1 = 0;
-};
-$java.nms_GuiDownloadTerrain_keyTyped = function($this, $par1, $par2) {
+$java.nms_NpcMerchant_setCustomer = function($this, $par1EntityPlayer) {
     return;
 };
-$java.nms_GuiDownloadTerrain_initGui = function($this) {
-    var var$1;
-    var$1 = $this.$buttonList;
-    ju_Arrays_fill(var$1.$array1, 0, var$1.$size0, null);
-    var$1.$size0 = 0;
+$java.nms_NpcMerchant_getRecipes = function($this, $par1EntityPlayer) {
+    return $this.$recipeList;
 };
-$java.nms_GuiDownloadTerrain_updateScreen = function($this) {
-    var var$1, var$2, var$3, $$je, $ptr, $tmp;
-    $ptr = 0;
-    if ($rt_resuming()) {
-        var $thread = $rt_nativeThread();
-        $ptr = $thread.pop();var$3 = $thread.pop();var$2 = $thread.pop();var$1 = $thread.pop();$this = $thread.pop();
-    }
-    main: while (true) { switch ($ptr) {
-    case 0:
-        $this.$updateCounter1 = $this.$updateCounter1 + 1 | 0;
-        if (!($this.$updateCounter1 % 20 | 0)) {
-            var$1 = $this.$netHandler;
-            var$2 = new nms_Packet0KeepAlive;
-            nms_Packet_$callClinit();
-            var$2.$creationTimeMillis = jl_System_currentTimeMillis();
-            var$2.$isChunkDataPacket = 0;
-            if (!var$1.$disconnected) {
-                var$1 = var$1.$netManager;
-                a: {
-                    try {
-                        ji_ByteArrayOutputStream_reset(var$1.$sendBuffer);
-                        nms_Packet_writePacket(var$2, ji_DataOutputStream__init_(var$1.$sendBuffer));
-                        nlea_EaglerAdapterImpl2_writePacket(ji_ByteArrayOutputStream_toByteArray(var$1.$sendBuffer));
-                        break a;
-                    } catch ($$e) {
-                        $$je = $rt_wrapException($$e);
-                        if ($$je instanceof ji_IOException) {
-                            var$1 = $$je;
-                        } else {
-                            throw $$e;
-                        }
-                    }
-                    if (jl_System_errCache === null) {
-                        var$3 = new ji_PrintStream;
-                        var$3.$out = new jl_ConsoleOutputStreamStderr;
-                        var$2 = new jl_StringBuilder;
-                        jl_Object__init_0(var$2);
-                        var$2.$buffer = $rt_createCharArray(16);
-                        var$3.$sb = var$2;
-                        var$3.$buffer0 = $rt_createCharArray(32);
-                        var$3.$autoFlush = 0;
-                        var$2 = new jnci_UTF8Charset;
-                        jnc_Charset__init_(var$2, $rt_s(2), $rt_createArray(jl_String, 0));
-                        var$3.$charset = var$2;
-                        jl_System_errCache = var$3;
-                    }
-                    jl_Throwable_printStackTrace0(var$1, jl_System_errCache);
-                }
-            }
-        }
-        if ($this.$netHandler === null)
-            return;
-        var$1 = $this.$netHandler;
-        $ptr = 1;
-    case 1:
-        $java.nms_NetClientHandler_processReadPackets(var$1);
-        if ($rt_suspending()) {
-            break main;
-        }
-        return;
-    default: $rt_invalidPointer();
-    }}
-    $rt_nativeThread().push($this, var$1, var$2, var$3, $ptr);
+$java.nms_NpcMerchant_setRecipes = function($this, $par1MerchantRecipeList) {
+    $this.$recipeList = $par1MerchantRecipeList;
 };
-$java.nms_GuiDownloadTerrain_drawScreen = function($this, $par1, $par2, $par3) {
-    var $var4, var$5, var$6, var$7;
-    nms_GuiScreen_drawBackground($this, 0);
-    $var4 = nms_StringTranslate_instance;
-    var$5 = $this.$fontRenderer0;
-    $var4 = nms_StringTranslate_translateKey($var4, $rt_s(2859));
-    var$6 = $this.$width0 / 2 | 0;
-    var$7 = ($this.$height0 / 2 | 0) - 50 | 0;
-    nms_FontRenderer_drawString(var$5, $var4, var$6 - (nms_FontRenderer_getStringWidth(var$5, $var4) / 2 | 0) | 0, var$7, 16777215, 1);
-    var$7 = 0;
-    a: {
-        while (var$7 < $this.$buttonList.$size0) {
-            $var4 = $this.$buttonList;
-            if (var$7 < 0)
-                break a;
-            if (var$7 >= $var4.$size0)
-                break a;
-            $var4.$array1.data[var$7].$drawButton($this.$mc4, $par1, $par2);
-            var$7 = var$7 + 1 | 0;
-        }
-        return;
-    }
-    $var4 = new jl_IndexOutOfBoundsException;
-    $var4.$suppressionEnabled = 1;
-    $var4.$writableStackTrace = 1;
-    $rt_throw($var4);
+$java.nms_NpcMerchant_useRecipe = function($this, $par1MerchantRecipe) {
+    return;
 };
-function nms_EntityPickupFX() {
-    var a = this; nms_EntityFX.call(a);
-    a.$entityToPickUp = null;
-    a.$entityPickingUp = null;
-    a.$age0 = 0;
-    a.$maxAge = 0;
-    a.$yOffs = 0.0;
-}
-function nms_EntityPickupFX__init_(var_0, var_1, var_2, var_3) {
-    var var_4 = new nms_EntityPickupFX();
-    $java.nms_EntityPickupFX__init_(var_4, var_0, var_1, var_2, var_3);
-    return var_4;
-}
-$java.nms_EntityPickupFX__init_ = function($this, $par1World, $par2Entity, $par3Entity, $par4) {
-    $java.nms_EntityFX__init_2($this, $par1World, $par2Entity.$posX, $par2Entity.$posY, $par2Entity.$posZ, $par2Entity.$motionX, $par2Entity.$motionY, $par2Entity.$motionZ);
-    $this.$age0 = 0;
-    $this.$maxAge = 0;
-    $this.$entityToPickUp = $par2Entity;
-    $this.$entityPickingUp = $par3Entity;
-    $this.$maxAge = 3;
-    $this.$yOffs = $par4;
-};
-$java.nms_EntityPickupFX_renderParticle = function($this, $par1Tessellator, $par2, $par3, $par4, $par5, $par6, $par7) {
-    var $var8, $var9, $var11, $var13, $var17, $var15, $var23, $var19, $var25, $var21, $var30, $var31, $var32, var$21, var$22, $ptr, $tmp;
-    $ptr = 0;
-    if ($rt_resuming()) {
-        var $thread = $rt_nativeThread();
-        $ptr = $thread.pop();var$22 = $thread.pop();var$21 = $thread.pop();$var32 = $thread.pop();$var31 = $thread.pop();$var30 = $thread.pop();$var21 = $thread.pop();$var25 = $thread.pop();$var19 = $thread.pop();$var23 = $thread.pop();$var15 = $thread.pop();$var17 = $thread.pop();$var13 = $thread.pop();$var11 = $thread.pop();$var9 = $thread.pop();$var8 = $thread.pop();$par7 = $thread.pop();$par6 = $thread.pop();$par5 = $thread.pop();$par4 = $thread.pop();$par3 = $thread.pop();$par2 = $thread.pop();$par1Tessellator
-        = $thread.pop();$this = $thread.pop();
-    }
-    main: while (true) { switch ($ptr) {
-    case 0:
-        $var8 = ($this.$age0 + $par2) / $this.$maxAge;
-        $par3 = $var8 * $var8;
-        $var9 = $this.$entityToPickUp.$posX;
-        $var11 = $this.$entityToPickUp.$posY;
-        $var13 = $this.$entityToPickUp.$posZ;
-        $var17 = $this.$entityPickingUp.$lastTickPosX;
-        $var15 = $this.$entityPickingUp.$posX - $this.$entityPickingUp.$lastTickPosX;
-        $var23 = $par2;
-        $var15 = $var17 + $var15 * $var23;
-        $var17 = $this.$entityPickingUp.$lastTickPosY + ($this.$entityPickingUp.$posY - $this.$entityPickingUp.$lastTickPosY) * $var23 + $this.$yOffs;
-        $var19 = $this.$entityPickingUp.$lastTickPosZ + ($this.$entityPickingUp.$posZ - $this.$entityPickingUp.$lastTickPosZ) * $var23;
-        $var15 = $var15 - $var9;
-        $var25 = $par3;
-        $var21 = $var9 + $var15 * $var25;
-        $var23 = $var11 + ($var17 - $var11) * $var25;
-        $var25 = $var13 + ($var19 - $var13) * $var25;
-        $var15 = $var23 + $this.$yOffset0 / 2.0;
-        a: {
-            $var30 = nms_Entity_getBrightnessForRender($this, $par2);
-            $var31 = $var30 % 65536 | 0;
-            $var32 = $var30 / 65536 | 0;
-            $var30 = nms_OpenGlHelper_lightmapTexUnit;
-            $par3 = $var31 / 1.0;
-            $par4 = $var32 / 1.0;
-            nleg_EaglerAdapterGL30_$callClinit();
-            switch ($var30) {
-                case 99:
-                    break;
-                case 100:
-                    nleg_EaglerAdapterGL30_tex1X = $par3;
-                    nleg_EaglerAdapterGL30_tex1Y = $par4;
-                    break a;
-                default:
-                    if (jl_System_errCache === null) {
-                        var$21 = new ji_PrintStream;
-                        var$21.$out = new jl_ConsoleOutputStreamStderr;
-                        $par1Tessellator = new jl_StringBuilder;
-                        $par1Tessellator.$buffer = $rt_createCharArray(16);
-                        var$21.$sb = $par1Tessellator;
-                        var$21.$buffer0 = $rt_createCharArray(32);
-                        var$21.$autoFlush = 0;
-                        $par1Tessellator = new jnci_UTF8Charset;
-                        jnc_Charset__init_($par1Tessellator, $rt_s(2), $rt_createArray(jl_String, 0));
-                        var$21.$charset = $par1Tessellator;
-                        jl_System_errCache = var$21;
-                    }
-                    var$22 = jl_System_errCache;
-                    var$21 = var$22.$sb;
-                    jl_AbstractStringBuilder_insert(var$21, var$21.$length, $rt_s(239));
-                    $var31 = var$21.$length;
-                    jl_AbstractStringBuilder_insertSpace(var$21, $var31, $var31 + 1 | 0);
-                    var$21.$buffer.data[$var31] = 10;
-                    ji_PrintStream_printSB(var$22);
-                    break a;
-            }
-            nleg_EaglerAdapterGL30_tex0X = $par3;
-            nleg_EaglerAdapterGL30_tex0Y = $par4;
-        }
-        nleg_EaglerAdapterGL30_colorR = 1.0;
-        nleg_EaglerAdapterGL30_colorG = 1.0;
-        nleg_EaglerAdapterGL30_colorB = 1.0;
-        nleg_EaglerAdapterGL30_colorA = 1.0;
-        $var15 = $var21 - nms_EntityFX_interpPosX;
-        $var17 = $var23 - nms_EntityFX_interpPosY;
-        $var19 = $var25 - nms_EntityFX_interpPosZ;
-        $par1Tessellator = nms_RenderManager_instance;
-        var$21 = $this.$entityToPickUp;
-        $var15 = $var15;
-        $var17 = $var17;
-        $var19 = $var19;
-        $par3 = $this.$entityToPickUp.$rotationYaw;
-        $ptr = 1;
-    case 1:
-        nms_RenderManager_renderEntityWithPosYaw($par1Tessellator, var$21, $var15, $var17, $var19, $par3, $par2);
-        if ($rt_suspending()) {
-            break main;
-        }
-        return;
-    default: $rt_invalidPointer();
-    }}
-    $rt_nativeThread().push($this, $par1Tessellator, $par2, $par3, $par4, $par5, $par6, $par7, $var8, $var9, $var11, $var13, $var17, $var15, $var23, $var19, $var25, $var21, $var30, $var31, $var32, var$21, var$22, $ptr);
-};
-$java.nms_EntityPickupFX_onUpdate = function($this) {
-    $this.$age0 = $this.$age0 + 1 | 0;
-    if ($this.$age0 == $this.$maxAge)
-        $this.$isDead = 1;
-};
-$java.nms_EntityPickupFX_getFXLayer = function($this) {
-    return 3;
-};
-function nms_ScoreObjectiveCriteria() {
-}
-$java.nms_ScoreObjectiveCriteria_field_96643_a = null;
-$java.nms_ScoreObjectiveCriteria_field_96641_b = null;
-$java.nms_ScoreObjectiveCriteria_field_96642_c = null;
-var nms_ScoreObjectiveCriteria_field_96639_d = null;
-var nms_ScoreObjectiveCriteria_field_96640_e = null;
-$java.nms_ScoreObjectiveCriteria_field_96638_f = null;
-function nms_ScoreObjectiveCriteria__clinit_() {
-    var var$1, var$2;
-    $java.nms_ScoreObjectiveCriteria_field_96643_a = ju_HashMap__init_1(16, 0.75);
-    var$1 = new $java.nms_ScoreDummyCriteria;
-    var$1.$field_96644_g = $rt_s(2860);
-    ju_HashMap_putImpl($java.nms_ScoreObjectiveCriteria_field_96643_a, $rt_s(2860), var$1);
-    $java.nms_ScoreObjectiveCriteria_field_96641_b = var$1;
-    var$2 = new $java.nms_ScoreDummyCriteria;
-    var$2.$field_96644_g = $rt_s(2861);
-    ju_HashMap_putImpl($java.nms_ScoreObjectiveCriteria_field_96643_a, $rt_s(2861), var$2);
-    $java.nms_ScoreObjectiveCriteria_field_96642_c = var$2;
-    var$2 = new $java.nms_ScoreDummyCriteria;
-    var$2.$field_96644_g = $rt_s(2862);
-    ju_HashMap_putImpl($java.nms_ScoreObjectiveCriteria_field_96643_a, $rt_s(2862), var$2);
-    nms_ScoreObjectiveCriteria_field_96639_d = var$2;
-    var$2 = new $java.nms_ScoreDummyCriteria;
-    var$2.$field_96644_g = $rt_s(2863);
-    ju_HashMap_putImpl($java.nms_ScoreObjectiveCriteria_field_96643_a, $rt_s(2863), var$2);
-    nms_ScoreObjectiveCriteria_field_96640_e = var$2;
-    var$2 = new $java.nms_ScoreHealthCriteria;
-    var$2.$field_96644_g = $rt_s(2864);
-    ju_HashMap_putImpl($java.nms_ScoreObjectiveCriteria_field_96643_a, $rt_s(2864), var$2);
-    $java.nms_ScoreObjectiveCriteria_field_96638_f = var$2;
-}
 function nms_GuiWinGame() {
     var a = this; nms_GuiScreen.call(a);
     a.$updateCounter3 = 0;
@@ -208328,16 +208052,16 @@ $java.nms_GuiWinGame_initGui = function($this) {
                 $var1 = $rt_s(44);
                 $var2 = jl_StringBuilder_toString(jl_StringBuilder_append9(jl_StringBuilder_append9(jl_StringBuilder_append9(jl_StringBuilder_append9(jl_StringBuilder_append0(jl_StringBuilder__init_(), $rt_s(44)), $java.nms_EnumChatFormatting_WHITE), $java.nms_EnumChatFormatting_OBFUSCATED), $java.nms_EnumChatFormatting_GREEN), $java.nms_EnumChatFormatting_AQUA));
                 $var5 = ju_Random__init_1(Long_fromInt(8124371));
-                var$4 = nlea_EaglerAdapterImpl2_fileContentsLines($rt_s(2865)).data.length;
+                var$4 = nlea_EaglerAdapterImpl2_fileContentsLines($rt_s(2859)).data.length;
                 var$5 = 0;
                 while (var$5 < var$4) {
                     nle_EaglerProfile_$callClinit();
-                    $var1 = jl_String_replaceAll($var1, $rt_s(2866), nle_EaglerProfile_username);
+                    $var1 = jl_String_replaceAll($var1, $rt_s(2860), nle_EaglerProfile_username);
                     while (jl_String_contains($var1, $var2)) {
                         $var6 = jl_String_indexOf2($var1, $var2);
                         $var7 = jl_String_substring0($var1, 0, $var6);
                         $var8 = jl_String_substring($var1, $var6 + jl_String_length($var2) | 0);
-                        $var1 = jl_StringBuilder_toString(jl_StringBuilder_append0(jl_StringBuilder_append0(jl_StringBuilder_append9(jl_StringBuilder_append9(jl_StringBuilder_append0(jl_StringBuilder__init_(), $var7), $java.nms_EnumChatFormatting_WHITE), $java.nms_EnumChatFormatting_OBFUSCATED), jl_String_substring0($rt_s(2867), 0, ju_Random_nextInt($var5, 4) + 3 | 0)), $var8));
+                        $var1 = jl_StringBuilder_toString(jl_StringBuilder_append0(jl_StringBuilder_append0(jl_StringBuilder_append9(jl_StringBuilder_append9(jl_StringBuilder_append0(jl_StringBuilder__init_(), $var7), $java.nms_EnumChatFormatting_WHITE), $java.nms_EnumChatFormatting_OBFUSCATED), jl_String_substring0($rt_s(2861), 0, ju_Random_nextInt($var5, 4) + 3 | 0)), $var8));
                     }
                     ju_AbstractCollection_addAll($this.$lines, nms_FontRenderer_listFormattedStringToWidth($this.$mc4.$fontRenderer, $var1, 274));
                     ju_ArrayList_add($this.$lines, $rt_s(44));
@@ -208348,11 +208072,11 @@ $java.nms_GuiWinGame_initGui = function($this) {
                     ju_ArrayList_add($this.$lines, $rt_s(44));
                     $var6_0 = $var6_0 + 1 | 0;
                 }
-                $var6_0 = nlea_EaglerAdapterImpl2_fileContentsLines($rt_s(2868)).data.length;
+                $var6_0 = nlea_EaglerAdapterImpl2_fileContentsLines($rt_s(2862)).data.length;
                 var$10 = 0;
                 while (var$10 < $var6_0) {
                     nle_EaglerProfile_$callClinit();
-                    $var1 = jl_String_replaceAll(jl_String_replaceAll($var1, $rt_s(2866), nle_EaglerProfile_username), $rt_s(2869), $rt_s(2870));
+                    $var1 = jl_String_replaceAll(jl_String_replaceAll($var1, $rt_s(2860), nle_EaglerProfile_username), $rt_s(2863), $rt_s(2864));
                     ju_AbstractCollection_addAll($this.$lines, nms_FontRenderer_listFormattedStringToWidth($this.$mc4.$fontRenderer, $var1, 274));
                     ju_ArrayList_add($this.$lines, $rt_s(44));
                     var$10 = var$10 + 1 | 0;
@@ -208489,7 +208213,7 @@ $java.nms_GuiWinGame_drawScreen = function($this, $par1, $par2, $par3) {
         $var11 = $var9 + $var8;
         if ($var11 + 12.0 + 8.0 > 0.0 && $var11 < $this.$height0) {
             $var12 = ju_ArrayList_get($this.$lines, $var10);
-            if (jl_String_startsWith0($var12, $rt_s(2871)))
+            if (jl_String_startsWith0($var12, $rt_s(2865)))
                 nms_FontRenderer_drawStringWithShadow($this.$fontRenderer0, jl_String_substring($var12, 3), $var6 + ((274 - nms_FontRenderer_getStringWidth($this.$fontRenderer0, jl_String_substring($var12, 3)) | 0) / 2 | 0) | 0, $var9, 16777215);
             else {
                 nle_EaglercraftRandom_setSeed($this.$fontRenderer0.$fontRandom, Long_add(Long_mul(Long_fromInt($var10), new Long(4238972211, 0)), Long_fromInt($this.$updateCounter3 / 4 | 0)));
@@ -208531,7 +208255,7 @@ $java.nms_GuiWinGame_drawScreen = function($this, $par1, $par2, $par3) {
 function nms_GuiWinGame__clinit_() {
     var var$1;
     var$1 = new nle_TextureLocation;
-    var$1.$path = $rt_s(2872);
+    var$1.$path = $rt_s(2866);
     var$1.$glObject = (-1);
     ju_ArrayList_add(nle_TextureLocation_locations, var$1);
     $java.nms_GuiWinGame_bk = var$1;
@@ -208546,6 +208270,174 @@ function nms_GuiWinGame__clinit_() {
     ju_ArrayList_add(nle_TextureLocation_locations, var$1);
     $java.nms_GuiWinGame_vigg = var$1;
 }
+function nms_ScoreObjectiveCriteria() {
+}
+$java.nms_ScoreObjectiveCriteria_field_96643_a = null;
+$java.nms_ScoreObjectiveCriteria_field_96641_b = null;
+$java.nms_ScoreObjectiveCriteria_field_96642_c = null;
+var nms_ScoreObjectiveCriteria_field_96639_d = null;
+var nms_ScoreObjectiveCriteria_field_96640_e = null;
+$java.nms_ScoreObjectiveCriteria_field_96638_f = null;
+function nms_ScoreObjectiveCriteria__clinit_() {
+    var var$1, var$2;
+    $java.nms_ScoreObjectiveCriteria_field_96643_a = ju_HashMap__init_1(16, 0.75);
+    var$1 = new $java.nms_ScoreDummyCriteria;
+    var$1.$field_96644_g = $rt_s(2867);
+    ju_HashMap_putImpl($java.nms_ScoreObjectiveCriteria_field_96643_a, $rt_s(2867), var$1);
+    $java.nms_ScoreObjectiveCriteria_field_96641_b = var$1;
+    var$2 = new $java.nms_ScoreDummyCriteria;
+    var$2.$field_96644_g = $rt_s(2868);
+    ju_HashMap_putImpl($java.nms_ScoreObjectiveCriteria_field_96643_a, $rt_s(2868), var$2);
+    $java.nms_ScoreObjectiveCriteria_field_96642_c = var$2;
+    var$2 = new $java.nms_ScoreDummyCriteria;
+    var$2.$field_96644_g = $rt_s(2869);
+    ju_HashMap_putImpl($java.nms_ScoreObjectiveCriteria_field_96643_a, $rt_s(2869), var$2);
+    nms_ScoreObjectiveCriteria_field_96639_d = var$2;
+    var$2 = new $java.nms_ScoreDummyCriteria;
+    var$2.$field_96644_g = $rt_s(2870);
+    ju_HashMap_putImpl($java.nms_ScoreObjectiveCriteria_field_96643_a, $rt_s(2870), var$2);
+    nms_ScoreObjectiveCriteria_field_96640_e = var$2;
+    var$2 = new $java.nms_ScoreHealthCriteria;
+    var$2.$field_96644_g = $rt_s(2871);
+    ju_HashMap_putImpl($java.nms_ScoreObjectiveCriteria_field_96643_a, $rt_s(2871), var$2);
+    $java.nms_ScoreObjectiveCriteria_field_96638_f = var$2;
+}
+$java.nms_WorldSettings = function() {
+    var a = this; jl_Object.call(a);
+    a.$seed0 = Long_ZERO;
+    a.$theGameType = null;
+    a.$mapFeaturesEnabled = 0;
+    a.$hardcoreEnabled = 0;
+    a.$terrainType2 = null;
+    a.$commandsAllowed = 0;
+    a.$field_82751_h = null;
+};
+$java.nms_WorldSettings_getSeed = function($this) {
+    return $this.$seed0;
+};
+$java.nms_WorldSettings_getGameType = function($this) {
+    return $this.$theGameType;
+};
+$java.nms_WorldSettings_getHardcoreEnabled = function($this) {
+    return $this.$hardcoreEnabled;
+};
+$java.nms_WorldSettings_isMapFeaturesEnabled = function($this) {
+    return $this.$mapFeaturesEnabled;
+};
+$java.nms_WorldSettings_getTerrainType = function($this) {
+    return $this.$terrainType2;
+};
+$java.nms_WorldSettings_areCommandsAllowed = function($this) {
+    return $this.$commandsAllowed;
+};
+$java.nms_WorldSettings_func_82749_j = function($this) {
+    return $this.$field_82751_h;
+};
+$java.nms_GuiDownloadTerrain = function() {
+    var a = this; nms_GuiScreen.call(a);
+    a.$netHandler = null;
+    a.$updateCounter1 = 0;
+};
+$java.nms_GuiDownloadTerrain_keyTyped = function($this, $par1, $par2) {
+    return;
+};
+$java.nms_GuiDownloadTerrain_initGui = function($this) {
+    var var$1;
+    var$1 = $this.$buttonList;
+    ju_Arrays_fill(var$1.$array1, 0, var$1.$size0, null);
+    var$1.$size0 = 0;
+};
+$java.nms_GuiDownloadTerrain_updateScreen = function($this) {
+    var var$1, var$2, var$3, $$je, $ptr, $tmp;
+    $ptr = 0;
+    if ($rt_resuming()) {
+        var $thread = $rt_nativeThread();
+        $ptr = $thread.pop();var$3 = $thread.pop();var$2 = $thread.pop();var$1 = $thread.pop();$this = $thread.pop();
+    }
+    main: while (true) { switch ($ptr) {
+    case 0:
+        $this.$updateCounter1 = $this.$updateCounter1 + 1 | 0;
+        if (!($this.$updateCounter1 % 20 | 0)) {
+            var$1 = $this.$netHandler;
+            var$2 = new nms_Packet0KeepAlive;
+            nms_Packet_$callClinit();
+            var$2.$creationTimeMillis = jl_System_currentTimeMillis();
+            var$2.$isChunkDataPacket = 0;
+            if (!var$1.$disconnected) {
+                var$1 = var$1.$netManager;
+                a: {
+                    try {
+                        ji_ByteArrayOutputStream_reset(var$1.$sendBuffer);
+                        nms_Packet_writePacket(var$2, ji_DataOutputStream__init_(var$1.$sendBuffer));
+                        nlea_EaglerAdapterImpl2_writePacket(ji_ByteArrayOutputStream_toByteArray(var$1.$sendBuffer));
+                        break a;
+                    } catch ($$e) {
+                        $$je = $rt_wrapException($$e);
+                        if ($$je instanceof ji_IOException) {
+                            var$1 = $$je;
+                        } else {
+                            throw $$e;
+                        }
+                    }
+                    if (jl_System_errCache === null) {
+                        var$3 = new ji_PrintStream;
+                        var$3.$out = new jl_ConsoleOutputStreamStderr;
+                        var$2 = new jl_StringBuilder;
+                        jl_Object__init_0(var$2);
+                        var$2.$buffer = $rt_createCharArray(16);
+                        var$3.$sb = var$2;
+                        var$3.$buffer0 = $rt_createCharArray(32);
+                        var$3.$autoFlush = 0;
+                        var$2 = new jnci_UTF8Charset;
+                        jnc_Charset__init_(var$2, $rt_s(2), $rt_createArray(jl_String, 0));
+                        var$3.$charset = var$2;
+                        jl_System_errCache = var$3;
+                    }
+                    jl_Throwable_printStackTrace0(var$1, jl_System_errCache);
+                }
+            }
+        }
+        if ($this.$netHandler === null)
+            return;
+        var$1 = $this.$netHandler;
+        $ptr = 1;
+    case 1:
+        $java.nms_NetClientHandler_processReadPackets(var$1);
+        if ($rt_suspending()) {
+            break main;
+        }
+        return;
+    default: $rt_invalidPointer();
+    }}
+    $rt_nativeThread().push($this, var$1, var$2, var$3, $ptr);
+};
+$java.nms_GuiDownloadTerrain_drawScreen = function($this, $par1, $par2, $par3) {
+    var $var4, var$5, var$6, var$7;
+    nms_GuiScreen_drawBackground($this, 0);
+    $var4 = nms_StringTranslate_instance;
+    var$5 = $this.$fontRenderer0;
+    $var4 = nms_StringTranslate_translateKey($var4, $rt_s(2872));
+    var$6 = $this.$width0 / 2 | 0;
+    var$7 = ($this.$height0 / 2 | 0) - 50 | 0;
+    nms_FontRenderer_drawString(var$5, $var4, var$6 - (nms_FontRenderer_getStringWidth(var$5, $var4) / 2 | 0) | 0, var$7, 16777215, 1);
+    var$7 = 0;
+    a: {
+        while (var$7 < $this.$buttonList.$size0) {
+            $var4 = $this.$buttonList;
+            if (var$7 < 0)
+                break a;
+            if (var$7 >= $var4.$size0)
+                break a;
+            $var4.$array1.data[var$7].$drawButton($this.$mc4, $par1, $par2);
+            var$7 = var$7 + 1 | 0;
+        }
+        return;
+    }
+    $var4 = new jl_IndexOutOfBoundsException;
+    $var4.$suppressionEnabled = 1;
+    $var4.$writableStackTrace = 1;
+    $rt_throw($var4);
+};
 function nms_EntityCrit2FX() {
     var a = this; nms_EntityFX.call(a);
     a.$theEntity = null;
@@ -209355,27 +209247,6 @@ function nms_Explosion_doExplosionB($this, $par1) {
 function nms_Explosion_func_94613_c($this) {
     return $this.$exploder === null ? null : $this.$exploder instanceof nms_EntityTNTPrimed ? $this.$exploder.$tntPlacedBy : !($this.$exploder instanceof nms_EntityLiving) ? null : $this.$exploder;
 }
-$java.nms_NpcMerchant = function() {
-    var a = this; jl_Object.call(a);
-    a.$theMerchantInventory = null;
-    a.$customer = null;
-    a.$recipeList = null;
-};
-$java.nms_NpcMerchant_getCustomer = function($this) {
-    return $this.$customer;
-};
-$java.nms_NpcMerchant_setCustomer = function($this, $par1EntityPlayer) {
-    return;
-};
-$java.nms_NpcMerchant_getRecipes = function($this, $par1EntityPlayer) {
-    return $this.$recipeList;
-};
-$java.nms_NpcMerchant_setRecipes = function($this, $par1MerchantRecipeList) {
-    $this.$recipeList = $par1MerchantRecipeList;
-};
-$java.nms_NpcMerchant_useRecipe = function($this, $par1MerchantRecipe) {
-    return;
-};
 function nms_GuiMerchant() {
     var a = this; nms_GuiContainer.call(a);
     a.$theIMerchant = null;
@@ -209895,6 +209766,143 @@ $java.nms_MerchantRecipeList_readRecipiesFromStream = function($par0DataInputStr
     }
     return $var1;
 };
+function nms_EntityPickupFX() {
+    var a = this; nms_EntityFX.call(a);
+    a.$entityToPickUp = null;
+    a.$entityPickingUp = null;
+    a.$age0 = 0;
+    a.$maxAge = 0;
+    a.$yOffs = 0.0;
+}
+function nms_EntityPickupFX__init_(var_0, var_1, var_2, var_3) {
+    var var_4 = new nms_EntityPickupFX();
+    $java.nms_EntityPickupFX__init_(var_4, var_0, var_1, var_2, var_3);
+    return var_4;
+}
+$java.nms_EntityPickupFX__init_ = function($this, $par1World, $par2Entity, $par3Entity, $par4) {
+    $java.nms_EntityFX__init_2($this, $par1World, $par2Entity.$posX, $par2Entity.$posY, $par2Entity.$posZ, $par2Entity.$motionX, $par2Entity.$motionY, $par2Entity.$motionZ);
+    $this.$age0 = 0;
+    $this.$maxAge = 0;
+    $this.$entityToPickUp = $par2Entity;
+    $this.$entityPickingUp = $par3Entity;
+    $this.$maxAge = 3;
+    $this.$yOffs = $par4;
+};
+$java.nms_EntityPickupFX_renderParticle = function($this, $par1Tessellator, $par2, $par3, $par4, $par5, $par6, $par7) {
+    var $var8, $var9, $var11, $var13, $var17, $var15, $var23, $var19, $var25, $var21, $var30, $var31, $var32, var$21, var$22, $ptr, $tmp;
+    $ptr = 0;
+    if ($rt_resuming()) {
+        var $thread = $rt_nativeThread();
+        $ptr = $thread.pop();var$22 = $thread.pop();var$21 = $thread.pop();$var32 = $thread.pop();$var31 = $thread.pop();$var30 = $thread.pop();$var21 = $thread.pop();$var25 = $thread.pop();$var19 = $thread.pop();$var23 = $thread.pop();$var15 = $thread.pop();$var17 = $thread.pop();$var13 = $thread.pop();$var11 = $thread.pop();$var9 = $thread.pop();$var8 = $thread.pop();$par7 = $thread.pop();$par6 = $thread.pop();$par5 = $thread.pop();$par4 = $thread.pop();$par3 = $thread.pop();$par2 = $thread.pop();$par1Tessellator
+        = $thread.pop();$this = $thread.pop();
+    }
+    main: while (true) { switch ($ptr) {
+    case 0:
+        $var8 = ($this.$age0 + $par2) / $this.$maxAge;
+        $par3 = $var8 * $var8;
+        $var9 = $this.$entityToPickUp.$posX;
+        $var11 = $this.$entityToPickUp.$posY;
+        $var13 = $this.$entityToPickUp.$posZ;
+        $var17 = $this.$entityPickingUp.$lastTickPosX;
+        $var15 = $this.$entityPickingUp.$posX - $this.$entityPickingUp.$lastTickPosX;
+        $var23 = $par2;
+        $var15 = $var17 + $var15 * $var23;
+        $var17 = $this.$entityPickingUp.$lastTickPosY + ($this.$entityPickingUp.$posY - $this.$entityPickingUp.$lastTickPosY) * $var23 + $this.$yOffs;
+        $var19 = $this.$entityPickingUp.$lastTickPosZ + ($this.$entityPickingUp.$posZ - $this.$entityPickingUp.$lastTickPosZ) * $var23;
+        $var15 = $var15 - $var9;
+        $var25 = $par3;
+        $var21 = $var9 + $var15 * $var25;
+        $var23 = $var11 + ($var17 - $var11) * $var25;
+        $var25 = $var13 + ($var19 - $var13) * $var25;
+        $var15 = $var23 + $this.$yOffset0 / 2.0;
+        a: {
+            $var30 = nms_Entity_getBrightnessForRender($this, $par2);
+            $var31 = $var30 % 65536 | 0;
+            $var32 = $var30 / 65536 | 0;
+            $var30 = nms_OpenGlHelper_lightmapTexUnit;
+            $par3 = $var31 / 1.0;
+            $par4 = $var32 / 1.0;
+            nleg_EaglerAdapterGL30_$callClinit();
+            switch ($var30) {
+                case 99:
+                    break;
+                case 100:
+                    nleg_EaglerAdapterGL30_tex1X = $par3;
+                    nleg_EaglerAdapterGL30_tex1Y = $par4;
+                    break a;
+                default:
+                    if (jl_System_errCache === null) {
+                        var$21 = new ji_PrintStream;
+                        var$21.$out = new jl_ConsoleOutputStreamStderr;
+                        $par1Tessellator = new jl_StringBuilder;
+                        $par1Tessellator.$buffer = $rt_createCharArray(16);
+                        var$21.$sb = $par1Tessellator;
+                        var$21.$buffer0 = $rt_createCharArray(32);
+                        var$21.$autoFlush = 0;
+                        $par1Tessellator = new jnci_UTF8Charset;
+                        jnc_Charset__init_($par1Tessellator, $rt_s(2), $rt_createArray(jl_String, 0));
+                        var$21.$charset = $par1Tessellator;
+                        jl_System_errCache = var$21;
+                    }
+                    var$22 = jl_System_errCache;
+                    var$21 = var$22.$sb;
+                    jl_AbstractStringBuilder_insert(var$21, var$21.$length, $rt_s(239));
+                    $var31 = var$21.$length;
+                    jl_AbstractStringBuilder_insertSpace(var$21, $var31, $var31 + 1 | 0);
+                    var$21.$buffer.data[$var31] = 10;
+                    ji_PrintStream_printSB(var$22);
+                    break a;
+            }
+            nleg_EaglerAdapterGL30_tex0X = $par3;
+            nleg_EaglerAdapterGL30_tex0Y = $par4;
+        }
+        nleg_EaglerAdapterGL30_colorR = 1.0;
+        nleg_EaglerAdapterGL30_colorG = 1.0;
+        nleg_EaglerAdapterGL30_colorB = 1.0;
+        nleg_EaglerAdapterGL30_colorA = 1.0;
+        $var15 = $var21 - nms_EntityFX_interpPosX;
+        $var17 = $var23 - nms_EntityFX_interpPosY;
+        $var19 = $var25 - nms_EntityFX_interpPosZ;
+        $par1Tessellator = nms_RenderManager_instance;
+        var$21 = $this.$entityToPickUp;
+        $var15 = $var15;
+        $var17 = $var17;
+        $var19 = $var19;
+        $par3 = $this.$entityToPickUp.$rotationYaw;
+        $ptr = 1;
+    case 1:
+        nms_RenderManager_renderEntityWithPosYaw($par1Tessellator, var$21, $var15, $var17, $var19, $par3, $par2);
+        if ($rt_suspending()) {
+            break main;
+        }
+        return;
+    default: $rt_invalidPointer();
+    }}
+    $rt_nativeThread().push($this, $par1Tessellator, $par2, $par3, $par4, $par5, $par6, $par7, $var8, $var9, $var11, $var13, $var17, $var15, $var23, $var19, $var25, $var21, $var30, $var31, $var32, var$21, var$22, $ptr);
+};
+$java.nms_EntityPickupFX_onUpdate = function($this) {
+    $this.$age0 = $this.$age0 + 1 | 0;
+    if ($this.$age0 == $this.$maxAge)
+        $this.$isDead = 1;
+};
+$java.nms_EntityPickupFX_getFXLayer = function($this) {
+    return 3;
+};
+function nms_WorldProviderSurface() {
+    nms_WorldProvider.call(this);
+}
+$java.nms_WorldProviderSurface__init_ = function() {
+    var var_0 = new nms_WorldProviderSurface();
+    nms_WorldProviderSurface__init_(var_0);
+    return var_0;
+};
+function nms_WorldProviderSurface__init_($this) {
+    $this.$isHellWorld = 0;
+    $this.$hasNoSky = 0;
+    $this.$lightBrightnessTable = $rt_createFloatArray(16);
+    $this.$dimensionId = 0;
+    $this.$colorsSunriseSunset = $rt_createFloatArray(4);
+}
 $java.nms_GameRuleValue = function() {
     var a = this; jl_Object.call(a);
     a.$valueString = null;
@@ -210139,6 +210147,16 @@ $java.nms_MerchantRecipe_func_82784_g = function($this) {
 $java.nms_MerchantRecipe_func_82785_h = function($this) {
     $this.$toolUses = $this.$maxTradeUses;
 };
+$java.nms_ScoreDummyCriteria = function() {
+    jl_Object.call(this);
+    this.$field_96644_g = null;
+};
+$java.nms_ScoreDummyCriteria_isReadOnly = function($this) {
+    return 0;
+};
+$java.nms_ScoreHealthCriteria = function() {
+    $java.nms_ScoreDummyCriteria.call(this);
+};
 function nms_WorldProviderHell() {
     nms_WorldProvider.call(this);
 }
@@ -210238,16 +210256,6 @@ $java.nms_WorldProviderEnd_getCloudHeight = function($this) {
 $java.nms_WorldProviderEnd_doesXZShowFog = function($this, $par1, $par2) {
     return 1;
 };
-$java.nms_ScoreDummyCriteria = function() {
-    jl_Object.call(this);
-    this.$field_96644_g = null;
-};
-$java.nms_ScoreDummyCriteria_isReadOnly = function($this) {
-    return 0;
-};
-$java.nms_ScoreHealthCriteria = function() {
-    $java.nms_ScoreDummyCriteria.call(this);
-};
 function nms_InventoryEnderChest() {
     $java.nms_InventoryBasic.call(this);
     this.$associatedChest = null;
@@ -225610,40 +225618,6 @@ $java.nms_EnchantmentNameParts__clinit_ = function() {
     var$1.$wordList = jur_Pattern_split(jur_Pattern_compile($rt_s(320), 0), $rt_s(2979), 0);
     $java.nms_EnchantmentNameParts_instance = var$1;
 };
-function nms_GuiButtonMerchant() {
-    nms_GuiButton.call(this);
-    this.$mirrored = 0;
-}
-$java.nms_GuiButtonMerchant_tex = null;
-$java.nms_GuiButtonMerchant_drawButton = function($this, $par1Minecraft, $par2, $par3) {
-    var $var4, $var5, $var6;
-    if ($this.$drawButton0) {
-        nle_TextureLocation_bindTexture($java.nms_GuiButtonMerchant_tex);
-        nleg_EaglerAdapterGL30_$callClinit();
-        nleg_EaglerAdapterGL30_colorR = 1.0;
-        nleg_EaglerAdapterGL30_colorG = 1.0;
-        nleg_EaglerAdapterGL30_colorB = 1.0;
-        nleg_EaglerAdapterGL30_colorA = 1.0;
-        $var4 = $par2 >= $this.$xPosition3 && $par3 >= $this.$yPosition && $par2 < ($this.$xPosition3 + $this.$width3 | 0) && $par3 < ($this.$yPosition + $this.$height4 | 0) ? 1 : 0;
-        $var5 = 0;
-        $var6 = 176;
-        if (!$this.$enabled)
-            $var6 = $var6 + ($this.$width3 * 2 | 0) | 0;
-        else if ($var4)
-            $var6 = $var6 + $this.$width3 | 0;
-        if (!$this.$mirrored)
-            $var5 = $var5 + $this.$height4 | 0;
-        nms_Gui_drawTexturedModalRect($this, $this.$xPosition3, $this.$yPosition, $var6, $var5, $this.$width3, $this.$height4);
-    }
-};
-function nms_GuiButtonMerchant__clinit_() {
-    var var$1;
-    var$1 = new nle_TextureLocation;
-    var$1.$path = $rt_s(2875);
-    var$1.$glObject = (-1);
-    ju_ArrayList_add(nle_TextureLocation_locations, var$1);
-    $java.nms_GuiButtonMerchant_tex = var$1;
-}
 function nms_GuiBeaconButton() {
     var a = this; nms_GuiButton.call(a);
     a.$buttonTexture = null;
@@ -225716,6 +225690,40 @@ $java.nms_GuiBeaconButtonCancel_func_82251_b = function($this, $par1, $par2) {
     var$4.$array3 = var$5;
     nms_GuiContainer_func_102021_a(var$3, var$4, $par1, $par2);
 };
+function nms_GuiButtonMerchant() {
+    nms_GuiButton.call(this);
+    this.$mirrored = 0;
+}
+$java.nms_GuiButtonMerchant_tex = null;
+$java.nms_GuiButtonMerchant_drawButton = function($this, $par1Minecraft, $par2, $par3) {
+    var $var4, $var5, $var6;
+    if ($this.$drawButton0) {
+        nle_TextureLocation_bindTexture($java.nms_GuiButtonMerchant_tex);
+        nleg_EaglerAdapterGL30_$callClinit();
+        nleg_EaglerAdapterGL30_colorR = 1.0;
+        nleg_EaglerAdapterGL30_colorG = 1.0;
+        nleg_EaglerAdapterGL30_colorB = 1.0;
+        nleg_EaglerAdapterGL30_colorA = 1.0;
+        $var4 = $par2 >= $this.$xPosition3 && $par3 >= $this.$yPosition && $par2 < ($this.$xPosition3 + $this.$width3 | 0) && $par3 < ($this.$yPosition + $this.$height4 | 0) ? 1 : 0;
+        $var5 = 0;
+        $var6 = 176;
+        if (!$this.$enabled)
+            $var6 = $var6 + ($this.$width3 * 2 | 0) | 0;
+        else if ($var4)
+            $var6 = $var6 + $this.$width3 | 0;
+        if (!$this.$mirrored)
+            $var5 = $var5 + $this.$height4 | 0;
+        nms_Gui_drawTexturedModalRect($this, $this.$xPosition3, $this.$yPosition, $var6, $var5, $this.$width3, $this.$height4);
+    }
+};
+function nms_GuiButtonMerchant__clinit_() {
+    var var$1;
+    var$1 = new nle_TextureLocation;
+    var$1.$path = $rt_s(2875);
+    var$1.$glObject = (-1);
+    ju_ArrayList_add(nle_TextureLocation_locations, var$1);
+    $java.nms_GuiButtonMerchant_tex = var$1;
+}
 $java.nms_GuiBeaconButtonPower = function() {
     var a = this; nms_GuiBeaconButton.call(a);
     a.$field_82261_l = 0;
@@ -229461,8 +229469,8 @@ jn_IntBufferOverByteBuffer, 0, jn_IntBufferImpl, [], 1, 0, 0, ["$readOnly2", fun
 jn_IntBufferOverByteBufferLittleEndian, 0, jn_IntBufferOverByteBuffer, [], 0, 0, 0, ["$getElement", function(var_1) { return jn_IntBufferOverByteBufferLittleEndian_getElement(this, var_1); }, "$putElement", function(var_1, var_2) { jn_IntBufferOverByteBufferLittleEndian_putElement(this, var_1, var_2); }],
 jn_IntBufferOverByteBufferBigEndian, 0, jn_IntBufferOverByteBuffer, [], 0, 0, 0, ["$getElement", function(var_1) { return jn_IntBufferOverByteBufferBigEndian_getElement(this, var_1); }, "$putElement", function(var_1, var_2) { jn_IntBufferOverByteBufferBigEndian_putElement(this, var_1, var_2); }],
 cbpc_IEND, 0, cbpc_Chunk, [], 0, 3, 0, 0,
-cbpc_IDAT, "IDAT", 3, cbpc_Chunk, [], 0, 3, 0, 0,
 cbpc_PLTE, 0, cbpc_Chunk, [], 0, 3, 0, 0,
+cbpc_IDAT, "IDAT", 3, cbpc_Chunk, [], 0, 3, 0, 0,
 jl_Double, "Double", 15, jl_Number, [jl_Comparable], 0, 3, 0, ["$intValue", function() { return jl_Double_intValue(this); }, "$toString", function() { return jl_Double_toString(this); }, "$hashCode0", function() { return jl_Double_hashCode(this); }],
 nms_OpenGlHelper, 0, jl_Object, [], 0, 3, 0, 0,
 nms_TextureManager, 0, jl_Object, [], 0, 3, 0, 0,
@@ -229777,12 +229785,12 @@ cjj_InfCodes, 0, jl_Object, [], 4, 0, 0, 0,
 nms_PlayerControllerMP, 0, jl_Object, [], 0, 3, 0, 0,
 nms_EntityOtherPlayerMP, "EntityOtherPlayerMP", 28, nms_EntityPlayer, [], 0, 3, 0, ["$resetHeight", function() { nms_EntityOtherPlayerMP_resetHeight(this); }, "$attackEntityFrom", function(var_1, var_2) { return nms_EntityOtherPlayerMP_attackEntityFrom(this, var_1, var_2); }, "$setPositionAndRotation2", function(var_1, var_2, var_3, var_4, var_5, var_6) { nms_EntityOtherPlayerMP_setPositionAndRotation2(this, var_1, var_2, var_3, var_4, var_5, var_6); }, "$updateCloak", function() { nms_EntityOtherPlayerMP_updateCloak(this);
 }, "$onUpdate", function() { nms_EntityOtherPlayerMP_onUpdate(this); }, "$getShadowSize", function() { return nms_EntityOtherPlayerMP_getShadowSize(this); }, "$onLivingUpdate", function() { nms_EntityOtherPlayerMP_onLivingUpdate(this); }, "$setCurrentItemOrArmor", function(var_1, var_2) { nms_EntityOtherPlayerMP_setCurrentItemOrArmor(this, var_1, var_2); }, "$getEyeHeight", function() { return nms_EntityOtherPlayerMP_getEyeHeight(this); }],
+nms_PlayerCapabilities, 0, jl_Object, [], 0, 3, 0, 0,
 nms_Vec3, "Vec3", 28, jl_Object, [], 0, 3, 0, ["$toString", function() { return nms_Vec3_toString(this); }],
 nms_GuiParticle, 0, nms_Gui, [], 0, 3, 0, 0,
 nms_MovingObjectPosition, 0, jl_Object, [], 0, 3, 0, 0,
 nms_EnumMovingObjectType, 0, jl_Enum, [], 12, 3, 0, 0,
 nms_ItemStack, "ItemStack", 28, jl_Object, [], 4, 3, 0, ["$toString", function() { return nms_ItemStack_toString(this); }],
-nms_PlayerCapabilities, 0, jl_Object, [], 0, 3, 0, 0,
 nms_Block, "Block", 28, jl_Object, [], 0, 3, nms_Block_$callClinit, ["$initializeBlock", function() { nms_Block_initializeBlock(this); }, "$renderAsNormalBlock", function() { return nms_Block_renderAsNormalBlock(this); }, "$getBlocksMovement", function(var_1, var_2, var_3, var_4) { return nms_Block_getBlocksMovement(this, var_1, var_2, var_3, var_4); }, "$getRenderType", function() { return nms_Block_getRenderType(this); }, "$getBlockBrightness", function(var_1, var_2, var_3, var_4) { return nms_Block_getBlockBrightness(this,
 var_1, var_2, var_3, var_4); }, "$getMixedBrightnessForBlock", function(var_1, var_2, var_3, var_4) { return nms_Block_getMixedBrightnessForBlock(this, var_1, var_2, var_3, var_4); }, "$shouldSideBeRendered", function(var_1, var_2, var_3, var_4, var_5) { return nms_Block_shouldSideBeRendered(this, var_1, var_2, var_3, var_4, var_5); }, "$getBlockTexture", function(var_1, var_2, var_3, var_4, var_5) { return nms_Block_getBlockTexture(this, var_1, var_2, var_3, var_4, var_5); }, "$getIcon", function(var_1, var_2)
 { return nms_Block_getIcon(this, var_1, var_2); }, "$getSelectedBoundingBoxFromPool", function(var_1, var_2, var_3, var_4) { return nms_Block_getSelectedBoundingBoxFromPool(this, var_1, var_2, var_3, var_4); }, "$addCollisionBoxesToList", function(var_1, var_2, var_3, var_4, var_5, var_6, var_7) { nms_Block_addCollisionBoxesToList(this, var_1, var_2, var_3, var_4, var_5, var_6, var_7); }, "$getCollisionBoundingBoxFromPool", function(var_1, var_2, var_3, var_4) { return nms_Block_getCollisionBoundingBoxFromPool(this,
@@ -230905,28 +230913,28 @@ nms_EntityJumpHelper, 0, jl_Object, [], 0, 3, 0, 0,
 nms_EntityBodyHelper, 0, jl_Object, [], 0, 3, 0, 0,
 nms_EntitySenses, 0, jl_Object, [], 0, 3, 0, 0,
 cjj_GZIPInputStream, 0, cjj_InflaterInputStream, [], 0, 3, 0, 0,
-nms_WorldProviderSurface, 0, nms_WorldProvider, [], 0, 3, 0, 0,
+$java.nms_NpcMerchant, 0, jl_Object, [nms_IMerchant], 0, 3, 0, ["$getCustomer", function() { return $java.nms_NpcMerchant_getCustomer(this); }, "$setCustomer", function(var_1) { $java.nms_NpcMerchant_setCustomer(this, var_1); }, "$getRecipes", function(var_1) { return $java.nms_NpcMerchant_getRecipes(this, var_1); }, "$setRecipes", function(var_1) { $java.nms_NpcMerchant_setRecipes(this, var_1); }, "$useRecipe", function(var_1) { $java.nms_NpcMerchant_useRecipe(this, var_1); }],
+nms_GuiWinGame, 0, nms_GuiScreen, [], 0, 3, 0, ["$updateScreen", function() { $java.nms_GuiWinGame_updateScreen(this); }, "$keyTyped", function(var_1, var_2) { $java.nms_GuiWinGame_keyTyped(this, var_1, var_2); }, "$initGui", function() { $java.nms_GuiWinGame_initGui(this); }, "$drawScreen", function(var_1, var_2, var_3) { $java.nms_GuiWinGame_drawScreen(this, var_1, var_2, var_3); }],
+nms_ScoreObjectiveCriteria, 0, jl_Object, [], 3, 3, 0, 0,
 $java.nms_WorldSettings, 0, jl_Object, [], 4, 3, 0, 0,
 $java.nms_GuiDownloadTerrain, 0, nms_GuiScreen, [], 0, 3, 0, ["$keyTyped", function(var_1, var_2) { $java.nms_GuiDownloadTerrain_keyTyped(this, var_1, var_2); }, "$initGui", function() { $java.nms_GuiDownloadTerrain_initGui(this); }, "$updateScreen", function() { $java.nms_GuiDownloadTerrain_updateScreen(this); }, "$drawScreen", function(var_1, var_2, var_3) { $java.nms_GuiDownloadTerrain_drawScreen(this, var_1, var_2, var_3); }],
-nms_EntityPickupFX, "EntityPickupFX", 28, nms_EntityFX, [], 0, 3, 0, ["$renderParticle", function(var_1, var_2, var_3, var_4, var_5, var_6, var_7) { $java.nms_EntityPickupFX_renderParticle(this, var_1, var_2, var_3, var_4, var_5, var_6, var_7); }, "$onUpdate", function() { $java.nms_EntityPickupFX_onUpdate(this); }, "$getFXLayer", function() { return $java.nms_EntityPickupFX_getFXLayer(this); }],
-nms_ScoreObjectiveCriteria, 0, jl_Object, [], 3, 3, 0, 0,
-nms_GuiWinGame, 0, nms_GuiScreen, [], 0, 3, 0, ["$updateScreen", function() { $java.nms_GuiWinGame_updateScreen(this); }, "$keyTyped", function(var_1, var_2) { $java.nms_GuiWinGame_keyTyped(this, var_1, var_2); }, "$initGui", function() { $java.nms_GuiWinGame_initGui(this); }, "$drawScreen", function(var_1, var_2, var_3) { $java.nms_GuiWinGame_drawScreen(this, var_1, var_2, var_3); }],
 nms_EntityCrit2FX, "EntityCrit2FX", 28, nms_EntityFX, [], 0, 3, 0, ["$renderParticle", function(var_1, var_2, var_3, var_4, var_5, var_6, var_7) { $java.nms_EntityCrit2FX_renderParticle(this, var_1, var_2, var_3, var_4, var_5, var_6, var_7); }, "$onUpdate", function() { $java.nms_EntityCrit2FX_onUpdate(this); }, "$getFXLayer", function() { return $java.nms_EntityCrit2FX_getFXLayer(this); }],
 nms_Explosion, 0, jl_Object, [], 0, 3, 0, 0,
-$java.nms_NpcMerchant, 0, jl_Object, [nms_IMerchant], 0, 3, 0, ["$getCustomer", function() { return $java.nms_NpcMerchant_getCustomer(this); }, "$setCustomer", function(var_1) { $java.nms_NpcMerchant_setCustomer(this, var_1); }, "$getRecipes", function(var_1) { return $java.nms_NpcMerchant_getRecipes(this, var_1); }, "$setRecipes", function(var_1) { $java.nms_NpcMerchant_setRecipes(this, var_1); }, "$useRecipe", function(var_1) { $java.nms_NpcMerchant_useRecipe(this, var_1); }],
 nms_GuiMerchant, 0, nms_GuiContainer, [], 0, 3, 0, ["$initGui", function() { $java.nms_GuiMerchant_initGui(this); }, "$drawGuiContainerForegroundLayer", function(var_1, var_2) { $java.nms_GuiMerchant_drawGuiContainerForegroundLayer(this, var_1, var_2); }, "$updateScreen", function() { $java.nms_GuiMerchant_updateScreen(this); }, "$actionPerformed", function(var_1) { $java.nms_GuiMerchant_actionPerformed(this, var_1); }, "$drawGuiContainerBackgroundLayer", function(var_1, var_2, var_3) { $java.nms_GuiMerchant_drawGuiContainerBackgroundLayer(this,
 var_1, var_2, var_3); }, "$drawScreen", function(var_1, var_2, var_3) { $java.nms_GuiMerchant_drawScreen(this, var_1, var_2, var_3); }],
 nms_MerchantRecipeList, 0, ju_ArrayList, [], 0, 3, 0, 0,
+nms_EntityPickupFX, "EntityPickupFX", 28, nms_EntityFX, [], 0, 3, 0, ["$renderParticle", function(var_1, var_2, var_3, var_4, var_5, var_6, var_7) { $java.nms_EntityPickupFX_renderParticle(this, var_1, var_2, var_3, var_4, var_5, var_6, var_7); }, "$onUpdate", function() { $java.nms_EntityPickupFX_onUpdate(this); }, "$getFXLayer", function() { return $java.nms_EntityPickupFX_getFXLayer(this); }],
+nms_WorldProviderSurface, 0, nms_WorldProvider, [], 0, 3, 0, 0,
 $java.nms_GameRuleValue, "GameRuleValue", 28, jl_Object, [], 0, 0, 0, 0,
 $java.nms_InventoryMerchant, 0, jl_Object, [nms_IInventory], 0, 3, 0, ["$getStackInSlot", function(var_1) { return $java.nms_InventoryMerchant_getStackInSlot(this, var_1); }, "$decrStackSize", function(var_1, var_2) { return $java.nms_InventoryMerchant_decrStackSize(this, var_1, var_2); }, "$setInventorySlotContents", function(var_1, var_2) { $java.nms_InventoryMerchant_setInventorySlotContents(this, var_1, var_2); }, "$getInventoryStackLimit", function() { return $java.nms_InventoryMerchant_getInventoryStackLimit(this);
 }, "$onInventoryChanged", function() { $java.nms_InventoryMerchant_onInventoryChanged(this); }],
 nms_MerchantRecipe, "MerchantRecipe", 28, jl_Object, [], 0, 3, 0, 0]);
-$rt_metadata([nms_WorldProviderHell, 0, nms_WorldProvider, [], 0, 3, 0, ["$registerWorldChunkManager", function() { $java.nms_WorldProviderHell_registerWorldChunkManager(this); }, "$getFogColor0", function(var_1, var_2) { return $java.nms_WorldProviderHell_getFogColor(this, var_1, var_2); }, "$generateLightBrightnessTable", function() { $java.nms_WorldProviderHell_generateLightBrightnessTable(this); }, "$isSurfaceWorld", function() { return $java.nms_WorldProviderHell_isSurfaceWorld(this); }, "$calculateCelestialAngle",
-function(var_1, var_2) { return $java.nms_WorldProviderHell_calculateCelestialAngle(this, var_1, var_2); }, "$canRespawnHere", function() { return $java.nms_WorldProviderHell_canRespawnHere(this); }, "$doesXZShowFog", function(var_1, var_2) { return $java.nms_WorldProviderHell_doesXZShowFog(this, var_1, var_2); }],
+$rt_metadata([$java.nms_ScoreDummyCriteria, "ScoreDummyCriteria", 28, jl_Object, [nms_ScoreObjectiveCriteria], 0, 3, 0, 0,
+$java.nms_ScoreHealthCriteria, "ScoreHealthCriteria", 28, $java.nms_ScoreDummyCriteria, [], 0, 3, 0, 0,
+nms_WorldProviderHell, 0, nms_WorldProvider, [], 0, 3, 0, ["$registerWorldChunkManager", function() { $java.nms_WorldProviderHell_registerWorldChunkManager(this); }, "$getFogColor0", function(var_1, var_2) { return $java.nms_WorldProviderHell_getFogColor(this, var_1, var_2); }, "$generateLightBrightnessTable", function() { $java.nms_WorldProviderHell_generateLightBrightnessTable(this); }, "$isSurfaceWorld", function() { return $java.nms_WorldProviderHell_isSurfaceWorld(this); }, "$calculateCelestialAngle", function(var_1,
+var_2) { return $java.nms_WorldProviderHell_calculateCelestialAngle(this, var_1, var_2); }, "$canRespawnHere", function() { return $java.nms_WorldProviderHell_canRespawnHere(this); }, "$doesXZShowFog", function(var_1, var_2) { return $java.nms_WorldProviderHell_doesXZShowFog(this, var_1, var_2); }],
 nms_WorldProviderEnd, 0, nms_WorldProvider, [], 0, 3, 0, ["$registerWorldChunkManager", function() { $java.nms_WorldProviderEnd_registerWorldChunkManager(this); }, "$calculateCelestialAngle", function(var_1, var_2) { return $java.nms_WorldProviderEnd_calculateCelestialAngle(this, var_1, var_2); }, "$calcSunriseSunsetColors", function(var_1, var_2) { return $java.nms_WorldProviderEnd_calcSunriseSunsetColors(this, var_1, var_2); }, "$getFogColor0", function(var_1, var_2) { return $java.nms_WorldProviderEnd_getFogColor(this,
 var_1, var_2); }, "$isSkyColored", function() { return $java.nms_WorldProviderEnd_isSkyColored(this); }, "$canRespawnHere", function() { return $java.nms_WorldProviderEnd_canRespawnHere(this); }, "$isSurfaceWorld", function() { return $java.nms_WorldProviderEnd_isSurfaceWorld(this); }, "$getCloudHeight", function() { return $java.nms_WorldProviderEnd_getCloudHeight(this); }, "$doesXZShowFog", function(var_1, var_2) { return $java.nms_WorldProviderEnd_doesXZShowFog(this, var_1, var_2); }],
-$java.nms_ScoreDummyCriteria, "ScoreDummyCriteria", 28, jl_Object, [nms_ScoreObjectiveCriteria], 0, 3, 0, 0,
-$java.nms_ScoreHealthCriteria, "ScoreHealthCriteria", 28, $java.nms_ScoreDummyCriteria, [], 0, 3, 0, 0,
 nms_InventoryEnderChest, 0, $java.nms_InventoryBasic, [], 0, 3, 0, ["$isUseableByPlayer", function(var_1) { return $java.nms_InventoryEnderChest_isUseableByPlayer(this, var_1); }, "$openChest", function() { $java.nms_InventoryEnderChest_openChest(this); }, "$closeChest", function() { $java.nms_InventoryEnderChest_closeChest(this); }],
 nms_ContainerPlayer, 0, nms_Container, [], 0, 3, 0, ["$onCraftMatrixChanged", function(var_1) { $java.nms_ContainerPlayer_onCraftMatrixChanged(this, var_1); }, "$onCraftGuiClosed", function(var_1) { nms_ContainerPlayer_onCraftGuiClosed(this, var_1); }, "$canInteractWith", function(var_1) { return $java.nms_ContainerPlayer_canInteractWith(this, var_1); }, "$transferStackInSlot", function(var_1, var_2) { return $java.nms_ContainerPlayer_transferStackInSlot(this, var_1, var_2); }, "$func_94530_a", function(var_1,
 var_2) { return $java.nms_ContainerPlayer_func_94530_a(this, var_1, var_2); }],
@@ -231047,10 +231055,10 @@ nms_EntityFireworkSparkFX, "EntityFireworkSparkFX", 28, nms_EntityFX, [], 0, 3,
 nms_EntityFireworkStarterFX, "EntityFireworkStarterFX", 28, nms_EntityFX, [], 0, 3, 0, ["$renderParticle", function(var_1, var_2, var_3, var_4, var_5, var_6, var_7) { $java.nms_EntityFireworkStarterFX_renderParticle(this, var_1, var_2, var_3, var_4, var_5, var_6, var_7); }, "$onUpdate", function() { $java.nms_EntityFireworkStarterFX_onUpdate(this); }, "$getFXLayer", function() { return $java.nms_EntityFireworkStarterFX_getFXLayer(this); }],
 cjj_Deflate, 0, jl_Object, [jl_Cloneable], 4, 3, 0, 0,
 nms_EnchantmentNameParts, 0, jl_Object, [], 0, 3, $java.nms_EnchantmentNameParts_$callClinit, 0]);
-$rt_metadata([nms_GuiButtonMerchant, "GuiButtonMerchant", 28, nms_GuiButton, [], 0, 0, 0, ["$drawButton", function(var_1, var_2, var_3) { $java.nms_GuiButtonMerchant_drawButton(this, var_1, var_2, var_3); }],
-nms_GuiBeaconButton, 0, nms_GuiButton, [], 0, 0, 0, ["$drawButton", function(var_1, var_2, var_3) { $java.nms_GuiBeaconButton_drawButton(this, var_1, var_2, var_3); }],
+$rt_metadata([nms_GuiBeaconButton, 0, nms_GuiButton, [], 0, 0, 0, ["$drawButton", function(var_1, var_2, var_3) { $java.nms_GuiBeaconButton_drawButton(this, var_1, var_2, var_3); }],
 $java.nms_GuiBeaconButtonConfirm, "GuiBeaconButtonConfirm", 28, nms_GuiBeaconButton, [], 0, 0, 0, ["$func_82251_b", function(var_1, var_2) { $java.nms_GuiBeaconButtonConfirm_func_82251_b(this, var_1, var_2); }],
 $java.nms_GuiBeaconButtonCancel, "GuiBeaconButtonCancel", 28, nms_GuiBeaconButton, [], 0, 0, 0, ["$func_82251_b", function(var_1, var_2) { $java.nms_GuiBeaconButtonCancel_func_82251_b(this, var_1, var_2); }],
+nms_GuiButtonMerchant, "GuiButtonMerchant", 28, nms_GuiButton, [], 0, 0, 0, ["$drawButton", function(var_1, var_2, var_3) { $java.nms_GuiButtonMerchant_drawButton(this, var_1, var_2, var_3); }],
 $java.nms_GuiBeaconButtonPower, "GuiBeaconButtonPower", 28, nms_GuiBeaconButton, [], 0, 0, 0, ["$func_82251_b", function(var_1, var_2) { $java.nms_GuiBeaconButtonPower_func_82251_b(this, var_1, var_2); }],
 cjj_Tree, 0, jl_Object, [], 4, 0, 0, 0,
 nms_EntitySelectorAlive, 0, jl_Object, [nms_IEntitySelector], 4, 0, 0, ["$isEntityApplicable", function(var_1) { return $java.nms_EntitySelectorAlive_isEntityApplicable(this, var_1); }],
@@ -231224,10 +231232,10 @@ $rt_stringPool(["Can\'t enter monitor from another thread synchronously", "@", "
 "Can\'t format argument of ", " using ", " conversion", "Can\'t convert code point ", " to char", "0x", "Illegal format flags: ", "+ ", "0-", "Missing format with for specifier ", "Duplicate format flags: ", "ws://", "wss://", "://", "invalid uri websocket protocol", "connect.failed", "wss", "invalid port number", "could not connect to ", "EAG|MySkin", "connect.connecting", "connect.authorizing", "container.furnace", "BurnTime", "CookTime", "RecordItem", "Record", "container.dispenser", "container.dropper",
 "container.brewing", "BrewTime", "Command", "SuccessCount", "TransferCooldown", "container.hopper", "OutputSignal", "explosion.player", "inFire", "inWall", "drown", "starve", "outOfWorld", "magic", "fallingBlock", "Can\'t set null data", "fail", "websocket to ", " failed", "okay", "Block", "cube", "base", "Kebab", "Aztec", "Alban", "Aztec2", "Bomb", "Plant", "Wasteland", "Pool", "Courbet", "Sea", "Sunset", "Creebet", "Wanderer", "Graham", "Match", "Bust", "Stage", "Void", "SkullAndRoses", "Wither", "Fighters",
 "Pointer", "Pigscene", "BurningSkull", "DonkeyKong", "Song length must not be negative.", "Song height must not be negative.", "Tempo is too small!", "Tempo must be a multiplication of 25.", "Auto-save duration must be from 1 to 60.", "Time signature must be from 2 to 8.", "RMinutes spent must not be negative.", "Right-click count must not be negative.", "Left-click count must not be negative.", "Blocks added must not be negative.", "Blocks removed must not be negative.", "Note position must not be negative.",
-"Volume must be from 0 to 100.", "Pitch must be from 0 to 87.", "ID must be from 1 to 9.", "HARP", "BASS", "DRUM", "SNARE", "CLICK", "GUITAR", "FLUTE", "BELL", "CHIME", "XYLOPHONE", "flat", "largeBiomes", "default_1_1", "NOT_SET", "SURVIVAL", "survival", "CREATIVE", "creative", "ADVENTURE", "adventure", "doFireTick", "doMobSpawning", "commandBlockOutput", "vines", "multiplayer.downloadingTerrain", "dummy", "deathCount", "playerKillCount", "totalKillCount", "health", "/title/win.txt", "PLAYERNAME", "XXXXXXXX",
-"/title/credits.txt", "\t", "    ", "[C]", "%blur%/gui/background.png", "entity.Villager.name", "MC|TrSel", "/gui/trading.png", "###", "#W#", "#X#", "XXX", "##", "X#X", "# #", " X ", "AAA", "BEB", "CCC", " # ", "X X", "XRX", "XSX", " B ", "A ", " B", "#  ", "## ", "  #", " #X", "# X", "# ", " X", "III", "#R#", "TTT", "D#D", " i ", "iii", "GGG", "QQQ", "WWW", "I I", "ICI", " I ", " recipes", "Invalid shapeless recipy!", "MultiplayerChunkCache: ", "XX", "X#", "MMM", "#-", "#E#", " R ", "RGR", "GSG", "OOO", "NN",
-"/gui/container.png", "/gui/crafting.png", "MC|Beacon", "tile.beacon.primary", "tile.beacon.secondary", "container.repair", "container.repair.cost", "container.repair.expensive", "MC|ItemName", "/gui/repair.png", "/gui/trap.png", "/gui/hopper.png", "/gui/alchemy.png", "/gui/enchant.png", "/gui/furnace.png", "OK", "NOT_POSSIBLE_HERE", "NOT_POSSIBLE_NOW", "TOO_FAR_AWAY", "OTHER_PROBLEM", "NOT_SAFE", "minecart.base", "minecart.inside", "Repair", "Naming an item only, cost too high; giving discount to cap cost to 39 levels",
-"Enchant", "finished", "failed to deflate", "UNDEFINED", "UNDEAD", "ARTHROPOD", "Done", "MC|AdvCdm", "advMode.setCommand", "advMode.command", "advMode.nearestPlayer", "advMode.randomPlayer", "advMode.allPlayers", "/misc/footprint.png", "/misc/explosion.png", "fireworks.", "blast", "largeBlast", "_far", "twinkle", "twinkle_far", "stream end", "file error", "stream error", "data error", "insufficient memory", "buffer error", "incompatible version", "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 ",
+"Volume must be from 0 to 100.", "Pitch must be from 0 to 87.", "ID must be from 1 to 9.", "HARP", "BASS", "DRUM", "SNARE", "CLICK", "GUITAR", "FLUTE", "BELL", "CHIME", "XYLOPHONE", "flat", "largeBiomes", "default_1_1", "NOT_SET", "SURVIVAL", "survival", "CREATIVE", "creative", "ADVENTURE", "adventure", "doFireTick", "doMobSpawning", "commandBlockOutput", "vines", "/title/win.txt", "PLAYERNAME", "XXXXXXXX", "/title/credits.txt", "\t", "    ", "[C]", "%blur%/gui/background.png", "dummy", "deathCount", "playerKillCount",
+"totalKillCount", "health", "multiplayer.downloadingTerrain", "entity.Villager.name", "MC|TrSel", "/gui/trading.png", "###", "#W#", "#X#", "XXX", "##", "X#X", "# #", " X ", "AAA", "BEB", "CCC", " # ", "X X", "XRX", "XSX", " B ", "A ", " B", "#  ", "## ", "  #", " #X", "# X", "# ", " X", "III", "#R#", "TTT", "D#D", " i ", "iii", "GGG", "QQQ", "WWW", "I I", "ICI", " I ", " recipes", "Invalid shapeless recipy!", "MultiplayerChunkCache: ", "XX", "X#", "MMM", "#-", "#E#", " R ", "RGR", "GSG", "OOO", "NN", "/gui/container.png",
+"/gui/crafting.png", "MC|Beacon", "tile.beacon.primary", "tile.beacon.secondary", "container.repair", "container.repair.cost", "container.repair.expensive", "MC|ItemName", "/gui/repair.png", "/gui/trap.png", "/gui/hopper.png", "/gui/alchemy.png", "/gui/enchant.png", "/gui/furnace.png", "OK", "NOT_POSSIBLE_HERE", "NOT_POSSIBLE_NOW", "TOO_FAR_AWAY", "OTHER_PROBLEM", "NOT_SAFE", "minecart.base", "minecart.inside", "Repair", "Naming an item only, cost too high; giving discount to cap cost to 39 levels", "Enchant",
+"finished", "failed to deflate", "UNDEFINED", "UNDEAD", "ARTHROPOD", "Done", "MC|AdvCdm", "advMode.setCommand", "advMode.command", "advMode.nearestPlayer", "advMode.randomPlayer", "advMode.allPlayers", "/misc/footprint.png", "/misc/explosion.png", "fireworks.", "blast", "largeBlast", "_far", "twinkle", "twinkle_far", "stream end", "file error", "stream error", "data error", "insufficient memory", "buffer error", "incompatible version", "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 ",
 "pages", "book.signButton", "book.finalizeButton", "MC|BEdit", "MC|BSign", "book.editTitle", "book.finalizeWarning", "book.pageIndicator", "/gui/book.png", "OW KNOWS!"]);
 jl_String.prototype.toString = function() {
     return $rt_ustr(this);
diff --git a/src/main/java/me/ayunami2000/ayuncraft/GuiScreenModules.java b/src/main/java/me/ayunami2000/ayuncraft/GuiScreenModules.java
index dfe0d3d..363a094 100644
--- a/src/main/java/me/ayunami2000/ayuncraft/GuiScreenModules.java
+++ b/src/main/java/me/ayunami2000/ayuncraft/GuiScreenModules.java
@@ -79,7 +79,8 @@ public class GuiScreenModules extends GuiScreen {
         }else if(par1GuiButton.id == 3){
             NoteblockPlayer.legit=!NoteblockPlayer.legit;
         }else if(par1GuiButton.id == 4){
-            mc.thePlayer.capabilities.isFlying=!mc.thePlayer.capabilities.isFlying;
+            NoteblockPlayer.flying=!NoteblockPlayer.flying;
+            if(!NoteblockPlayer.flying)mc.thePlayer.capabilities.isFlying=false;
         }
     }
 
diff --git a/src/main/java/me/ayunami2000/ayuncraft/NoteblockPlayer.java b/src/main/java/me/ayunami2000/ayuncraft/NoteblockPlayer.java
index cca7fdc..40e82c1 100644
--- a/src/main/java/me/ayunami2000/ayuncraft/NoteblockPlayer.java
+++ b/src/main/java/me/ayunami2000/ayuncraft/NoteblockPlayer.java
@@ -21,11 +21,14 @@ public class NoteblockPlayer {
     private static Minecraft mc=Minecraft.getMinecraft();
     public static boolean legit=false;
 
+    public static boolean flying=false;
+
     private static boolean playingSong=false;
     private static String[] songLiness=null;
     private static HashMap<Integer,HashMap<Integer,Vec3>> instrNoteToBlocks=null;
     private static int tickPassed=0;
     public static void tick(){
+        if(flying)mc.thePlayer.capabilities.isFlying=true;
         if(playing&&playingSong){
             int linesPlayed=0;
             for (String songLine : songLiness) {