diff --git a/javascript/classes.js b/javascript/classes.js
index df8dcbf..5deab7a 100644
--- a/javascript/classes.js
+++ b/javascript/classes.js
@@ -1183,8 +1183,8 @@ function nle_Client_main($args) {
         ju_TreeSet__clinit_();
         nms_IEntitySelector__clinit_();
         maan_Instrument__clinit_();
-        nms_WorldType__clinit_();
         nms_EnumGameType__clinit_();
+        nms_WorldType__clinit_();
         nms_GuiWinGame__clinit_();
         nms_ScoreObjectiveCriteria__clinit_();
         nms_GuiMerchant__clinit_();
@@ -1202,8 +1202,8 @@ function nle_Client_main($args) {
         nms_EnumCreatureAttribute__clinit_();
         nms_EntityFootStepFX__clinit_();
         nms_EntityLargeExplodeFX__clinit_();
-        nms_GuiBeaconButton__clinit_();
         nms_GuiButtonMerchant__clinit_();
+        nms_GuiBeaconButton__clinit_();
         nms_GuiScreenBook__clinit_();
         nms_GuiButtonNextPage__clinit_();
         nle_Client_registerErrorHandler$js_body$_5();
@@ -2144,11 +2144,11 @@ function otp_Platform_prepareNewInstance() {
     nms_GameRules[c] = nms_GameRules__init_;
     jn_InvalidMarkException[c] = jn_InvalidMarkException__init_;
     nms_GuiWinGame[c] = nms_GuiWinGame__init_;
-    nms_MerchantRecipeList[c] = nms_MerchantRecipeList__init_;
     nms_WorldProviderSurface[c] = nms_WorldProviderSurface__init_;
+    nms_MerchantRecipeList[c] = nms_MerchantRecipeList__init_;
+    nms_InventoryEnderChest[c] = nms_InventoryEnderChest__init_;
     nms_WorldProviderHell[c] = nms_WorldProviderHell__init_;
     nms_WorldProviderEnd[c] = nms_WorldProviderEnd__init_;
-    nms_InventoryEnderChest[c] = nms_InventoryEnderChest__init_;
     nms_InventoryCraftResult[c] = nms_InventoryCraftResult__init_;
     nms_CraftingManager[c] = nms_CraftingManager__init_;
     nms_LongHashMap[c] = nms_LongHashMap__init_;
@@ -7657,6 +7657,7 @@ function ji_IOException__init_($this) {
 function nleg_EaglerAdapterGL30() {
     nlea_EaglerAdapterImpl2.call(this);
 }
+var nleg_EaglerAdapterGL30_glBlendEnabled = 0;
 var nleg_EaglerAdapterGL30_isWebGL = 0;
 var nleg_EaglerAdapterGL30_texObjects = null;
 var nleg_EaglerAdapterGL30_enableTexture2D = 0;
@@ -7821,6 +7822,7 @@ function nleg_EaglerAdapterGL30_glEnable($p1) {
             case 16:
                 nlea_EaglerAdapterImpl2_$callClinit();
                 nlea_EaglerAdapterImpl2_webgl.enable(3042);
+                nleg_EaglerAdapterGL30_glBlendEnabled = 1;
                 break a;
             case 41:
                 break;
@@ -8021,6 +8023,7 @@ function nleg_EaglerAdapterGL30_glDisable($p1) {
             case 16:
                 nlea_EaglerAdapterImpl2_$callClinit();
                 nlea_EaglerAdapterImpl2_webgl.disable(3042);
+                nleg_EaglerAdapterGL30_glBlendEnabled = 0;
                 break a;
             case 41:
                 break;
@@ -9557,6 +9560,7 @@ function nleg_EaglerAdapterGL30_getTrianglesPerSecond() {
 }
 function nleg_EaglerAdapterGL30__clinit_() {
     var var$1, $i, var$3;
+    nleg_EaglerAdapterGL30_glBlendEnabled = 0;
     nlea_EaglerAdapterImpl2_$callClinit();
     nleg_EaglerAdapterGL30_isWebGL = 1;
     var$1 = new nleg_GLObjectMap;
@@ -9655,7 +9659,10 @@ function nleg_EaglerAdapterGL30__clinit_() {
     }
     $i = 0;
     while ($i < nleg_EaglerAdapterGL30_matTexV.data.length) {
-        nleg_EaglerAdapterGL30_matTexV.data[$i] = nlegv_Matrix4f__init_0();
+        var$3 = nleg_EaglerAdapterGL30_matTexV.data;
+        var$1 = new nlegv_Matrix4f;
+        nlegv_Matrix4f_setIdentity(var$1);
+        var$3[$i] = var$1;
         $i = $i + 1 | 0;
     }
     nleg_EaglerAdapterGL30_quadsToTrianglesBuffer = null;
@@ -9675,19 +9682,18 @@ function nleg_EaglerAdapterGL30__clinit_() {
     nleg_EaglerAdapterGL30_occlusion_program = null;
     nleg_EaglerAdapterGL30_occlusion_matrix_m = null;
     nleg_EaglerAdapterGL30_occlusion_matrix_p = null;
-    var$1 = new nleg_GLObjectMap;
-    var$1.$values = $rt_createArray(jl_Object, 256);
-    var$1.$size3 = 256;
-    var$1.$insertIndex = 0;
-    var$1.$allocatedObjects = 0;
-    nleg_EaglerAdapterGL30_queryObjs = var$1;
+    nleg_EaglerAdapterGL30_queryObjs = nleg_GLObjectMap__init_(256);
     var$1 = new nlegv_Matrix4f;
     nlegv_Matrix4f_setIdentity(var$1);
     nleg_EaglerAdapterGL30_cachedOcclusionP = nlegv_Matrix4f_setZero(var$1);
     nleg_EaglerAdapterGL30_occlusionModel = $rt_createFloatArray(16);
     nleg_EaglerAdapterGL30_occlusionProj = $rt_createFloatArray(16);
-    nleg_EaglerAdapterGL30_unprojA = nlegv_Matrix4f__init_0();
-    nleg_EaglerAdapterGL30_unprojB = nlegv_Matrix4f__init_0();
+    var$1 = new nlegv_Matrix4f;
+    nlegv_Matrix4f_setIdentity(var$1);
+    nleg_EaglerAdapterGL30_unprojA = var$1;
+    var$1 = new nlegv_Matrix4f;
+    nlegv_Matrix4f_setIdentity(var$1);
+    nleg_EaglerAdapterGL30_unprojB = var$1;
     nleg_EaglerAdapterGL30_unprojC = new nlegv_Vector4f;
     nleg_EaglerAdapterGL30_lastBandwidthReset = Long_ZERO;
     nleg_EaglerAdapterGL30_lastBandwidth = 0;
@@ -24050,6 +24056,17 @@ function nleg_GLObjectMap() {
     a.$insertIndex = 0;
     a.$allocatedObjects = 0;
 }
+function nleg_GLObjectMap__init_(var_0) {
+    var var_1 = new nleg_GLObjectMap();
+    nleg_GLObjectMap__init_0(var_1, var_0);
+    return var_1;
+}
+function nleg_GLObjectMap__init_0($this, $initialSize) {
+    $this.$values = $rt_createArray(jl_Object, $initialSize);
+    $this.$size3 = $initialSize;
+    $this.$insertIndex = 0;
+    $this.$allocatedObjects = 0;
+}
 function nleg_GLObjectMap_register($this, $obj) {
     var $start;
     $start = $this.$insertIndex;
@@ -24153,10 +24170,10 @@ function nlegv_Matrix4f_setIdentity($m) {
     $m.$m33 = 1.0;
     return $m;
 }
-function nlegv_Matrix4f_setZero($this) {
-    return nlegv_Matrix4f_setZero0($this);
+function nlegv_Matrix4f_setZero0($this) {
+    return nlegv_Matrix4f_setZero($this);
 }
-function nlegv_Matrix4f_setZero0($m) {
+function nlegv_Matrix4f_setZero($m) {
     $m.$m00 = 0.0;
     $m.$m01 = 0.0;
     $m.$m02 = 0.0;
@@ -56371,6 +56388,9 @@ 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;
@@ -56398,9 +56418,6 @@ 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;
@@ -62320,10 +62337,10 @@ function nleg_EffectPipeline__clinit_() {
     nleg_EffectPipeline_projBufferInv = $rt_createFloatArray(16);
     var$1 = new nlegv_Matrix4f;
     nlegv_Matrix4f_setIdentity(var$1);
-    nleg_EffectPipeline_projectionMatrix = nlegv_Matrix4f_setZero0(var$1);
+    nleg_EffectPipeline_projectionMatrix = nlegv_Matrix4f_setZero(var$1);
     var$1 = new nlegv_Matrix4f;
     nlegv_Matrix4f_setIdentity(var$1);
-    nleg_EffectPipeline_projectionMatrixInv = nlegv_Matrix4f_setZero0(var$1);
+    nleg_EffectPipeline_projectionMatrixInv = nlegv_Matrix4f_setZero(var$1);
     nleg_EffectPipeline_randomInterTimer = Long_ZERO;
     nleg_EffectPipeline_randomInterA = 0.0;
     nleg_EffectPipeline_randomInterB = 0.0;
@@ -70588,10 +70605,10 @@ function nleg_FixedFunctionShader__init_0($this, $j, $CC_a_color, $CC_a_normal,
     $this.$modelBuffer = $rt_createFloatArray(16);
     $this.$projectionBuffer = $rt_createFloatArray(16);
     $this.$textureBuffer = $rt_createFloatArray(16);
-    $this.$modelMatrix = nlegv_Matrix4f_setZero(nlegv_Matrix4f__init_0());
-    $this.$projectionMatrix = nlegv_Matrix4f_setZero(nlegv_Matrix4f__init_0());
-    $this.$textureMatrix = nlegv_Matrix4f_setZero(nlegv_Matrix4f__init_0());
-    $this.$inverseModelMatrix = nlegv_Matrix4f_setZero(nlegv_Matrix4f__init_0());
+    $this.$modelMatrix = nlegv_Matrix4f_setZero0(nlegv_Matrix4f__init_0());
+    $this.$projectionMatrix = nlegv_Matrix4f_setZero0(nlegv_Matrix4f__init_0());
+    $this.$textureMatrix = nlegv_Matrix4f_setZero0(nlegv_Matrix4f__init_0());
+    $this.$inverseModelMatrix = nlegv_Matrix4f_setZero0(nlegv_Matrix4f__init_0());
     $this.$light0Pos = nlegv_Vector4f__init_0();
     $this.$light1Pos = nlegv_Vector4f__init_0();
     $this.$anisotropicFix = nlegv_Vector2f__init_0(0.0, 0.0);
@@ -158000,13 +158017,13 @@ function jur_Pattern_split($this, $inputSeq, $limit) {
             if (var$8 >= $limit && $limit > 0)
                 break a;
             var$9 = $mat.$matchResult;
-            jur_MatchResultImpl_checkGroup(var$9, 0);
+            $java.jur_MatchResultImpl_checkGroup(var$9, 0);
             $index = var$9.$groupBounds.data[0];
             if ($curPos > $index)
                 break;
             ju_ArrayList_add($res, jl_String__init_0($inputSeq.$characters, $curPos, $index - $curPos | 0));
             var$9 = $mat.$matchResult;
-            jur_MatchResultImpl_checkGroup(var$9, 0);
+            $java.jur_MatchResultImpl_checkGroup(var$9, 0);
             $curPos = var$9.$groupBounds.data[1];
             $index = var$8;
         }
@@ -158048,9 +158065,9 @@ function jur_Pattern_split($this, $inputSeq, $limit) {
         var$11 = 0;
     return ju_AbstractCollection_toArray0($res, $rt_createArray(jl_String, var$11));
 }
-function jur_Pattern_split0($this, $input) {
+$java.jur_Pattern_split = function($this, $input) {
     return jur_Pattern_split($this, $input, 0);
-}
+};
 $java.jur_Pattern_pattern = function($this) {
     return $this.$lexemes.$orig;
 };
@@ -191119,7 +191136,7 @@ $java.jur_Matcher_appendReplacement = function($this, $buffer, $replacement) {
     $replacement = $this.$string3;
     var$3 = $this.$appendPos;
     var$4 = $this.$matchResult;
-    jur_MatchResultImpl_checkGroup(var$4, 0);
+    $java.jur_MatchResultImpl_checkGroup(var$4, 0);
     var$5 = var$4.$groupBounds.data[0];
     if (var$3 > var$5) {
         $buffer = new jl_IndexOutOfBoundsException;
@@ -191133,7 +191150,7 @@ $java.jur_Matcher_appendReplacement = function($this, $buffer, $replacement) {
     $replacement = $this.$processedRepl;
     jl_AbstractStringBuilder_insert($buffer, $buffer.$length, $replacement);
     $buffer = $this.$matchResult;
-    jur_MatchResultImpl_checkGroup($buffer, 0);
+    $java.jur_MatchResultImpl_checkGroup($buffer, 0);
     $this.$appendPos = $buffer.$groupBounds.data[1];
     return $this;
 };
@@ -191303,7 +191320,7 @@ function jur_Matcher_replaceAll($this, $replacement) {
         var$5 = $this.$string3;
         var$4 = $this.$appendPos;
         var$6 = $this.$matchResult;
-        jur_MatchResultImpl_checkGroup(var$6, 0);
+        $java.jur_MatchResultImpl_checkGroup(var$6, 0);
         var$3 = var$6.$groupBounds.data[0];
         if (var$4 > var$3)
             break;
@@ -191313,7 +191330,7 @@ function jur_Matcher_replaceAll($this, $replacement) {
         var$5 = $this.$processedRepl;
         jl_AbstractStringBuilder_insert($sb, $sb.$length, var$5);
         var$5 = $this.$matchResult;
-        jur_MatchResultImpl_checkGroup(var$5, 0);
+        $java.jur_MatchResultImpl_checkGroup(var$5, 0);
         $this.$appendPos = var$5.$groupBounds.data[1];
     }
     $replacement = new jl_IndexOutOfBoundsException;
@@ -191365,13 +191382,13 @@ function jur_Matcher_find($this) {
     if ($this.$matchResult.$startIndex >= 0 && $this.$matchResult.$mode3 == 1) {
         var$2 = $this.$matchResult;
         var$3 = $this.$matchResult;
-        jur_MatchResultImpl_checkGroup(var$3, 0);
+        $java.jur_MatchResultImpl_checkGroup(var$3, 0);
         var$2.$startIndex = var$3.$groupBounds.data[1];
         var$2 = $this.$matchResult;
-        jur_MatchResultImpl_checkGroup(var$2, 0);
+        $java.jur_MatchResultImpl_checkGroup(var$2, 0);
         var$4 = var$2.$groupBounds.data[1];
         var$2 = $this.$matchResult;
-        jur_MatchResultImpl_checkGroup(var$2, 0);
+        $java.jur_MatchResultImpl_checkGroup(var$2, 0);
         if (var$4 == var$2.$groupBounds.data[0]) {
             var$2 = $this.$matchResult;
             var$2.$startIndex = var$2.$startIndex + 1 | 0;
@@ -191383,13 +191400,13 @@ function jur_Matcher_find($this) {
 $java.jur_Matcher_start = function($this, $group) {
     var var$2;
     var$2 = $this.$matchResult;
-    jur_MatchResultImpl_checkGroup(var$2, $group);
+    $java.jur_MatchResultImpl_checkGroup(var$2, $group);
     return var$2.$groupBounds.data[$group * 2 | 0];
 };
 $java.jur_Matcher_end = function($this, $group) {
     var var$2;
     var$2 = $this.$matchResult;
-    jur_MatchResultImpl_checkGroup(var$2, $group);
+    $java.jur_MatchResultImpl_checkGroup(var$2, $group);
     return var$2.$groupBounds.data[($group * 2 | 0) + 1 | 0];
 };
 $java.jur_Matcher_matches = function($this) {
@@ -191413,13 +191430,13 @@ $java.jur_Matcher_matches = function($this) {
 $java.jur_Matcher_start0 = function($this) {
     var var$1;
     var$1 = $this.$matchResult;
-    jur_MatchResultImpl_checkGroup(var$1, 0);
+    $java.jur_MatchResultImpl_checkGroup(var$1, 0);
     return var$1.$groupBounds.data[0];
 };
 $java.jur_Matcher_end0 = function($this) {
     var var$1;
     var$1 = $this.$matchResult;
-    jur_MatchResultImpl_checkGroup(var$1, 0);
+    $java.jur_MatchResultImpl_checkGroup(var$1, 0);
     return var$1.$groupBounds.data[1];
 };
 $java.jur_Matcher_hasTransparentBounds = function($this) {
@@ -200584,7 +200601,7 @@ $java.ju_Objects__init_ = function() {
 function ju_Objects__init_($this) {
     return;
 }
-function jur_MatchResultImpl() {
+$java.jur_MatchResultImpl = function() {
     var a = this; jl_Object.call(a);
     a.$groupBounds = null;
     a.$consumers = null;
@@ -200601,9 +200618,9 @@ function jur_MatchResultImpl() {
     a.$requireEnd = 0;
     a.$previousMatch = 0;
     a.$mode3 = 0;
-}
+};
 $java.jur_MatchResultImpl__init_ = function(var_0, var_1, var_2, var_3, var_4, var_5) {
-    var var_6 = new jur_MatchResultImpl();
+    var var_6 = new $java.jur_MatchResultImpl();
     $java.jur_MatchResultImpl__init_0(var_6, var_0, var_1, var_2, var_3, var_4, var_5);
     return var_6;
 };
@@ -200629,11 +200646,11 @@ $java.jur_MatchResultImpl_getConsumed = function($this, $counter) {
     return $this.$consumers.data[$counter];
 };
 $java.jur_MatchResultImpl_end = function($this) {
-    jur_MatchResultImpl_checkGroup($this, 0);
+    $java.jur_MatchResultImpl_checkGroup($this, 0);
     return $this.$groupBounds.data[1];
 };
 $java.jur_MatchResultImpl_end0 = function($this, $group) {
-    jur_MatchResultImpl_checkGroup($this, $group);
+    $java.jur_MatchResultImpl_checkGroup($this, $group);
     return $this.$groupBounds.data[($group * 2 | 0) + 1 | 0];
 };
 $java.jur_MatchResultImpl_setStart = function($this, $group, $offset) {
@@ -200650,15 +200667,15 @@ $java.jur_MatchResultImpl_getEnd = function($this, $group) {
 };
 $java.jur_MatchResultImpl_group = function($this, $group) {
     var var$2, var$3, var$4, var$5;
-    jur_MatchResultImpl_checkGroup($this, $group);
+    $java.jur_MatchResultImpl_checkGroup($this, $group);
     var$2 = $this.$groupBounds.data;
     var$3 = $group * 2 | 0;
     if (var$2[var$3] < 0)
         return null;
     var$4 = $this.$string4;
-    jur_MatchResultImpl_checkGroup($this, $group);
+    $java.jur_MatchResultImpl_checkGroup($this, $group);
     var$5 = $this.$groupBounds.data[var$3];
-    jur_MatchResultImpl_checkGroup($this, $group);
+    $java.jur_MatchResultImpl_checkGroup($this, $group);
     var$3 = $this.$groupBounds.data[var$3 + 1 | 0];
     if (var$5 <= var$3)
         return jl_String__init_0(var$4.$characters, var$5, var$3 - var$5 | 0);
@@ -200687,11 +200704,11 @@ $java.jur_MatchResultImpl_getGroupNoCheck = function($this, $group) {
     return null;
 };
 $java.jur_MatchResultImpl_start = function($this) {
-    jur_MatchResultImpl_checkGroup($this, 0);
+    $java.jur_MatchResultImpl_checkGroup($this, 0);
     return $this.$groupBounds.data[0];
 };
 $java.jur_MatchResultImpl_start0 = function($this, $group) {
-    jur_MatchResultImpl_checkGroup($this, $group);
+    $java.jur_MatchResultImpl_checkGroup($this, $group);
     return $this.$groupBounds.data[$group * 2 | 0];
 };
 $java.jur_MatchResultImpl_finalizeMatch = function($this) {
@@ -200699,7 +200716,7 @@ $java.jur_MatchResultImpl_finalizeMatch = function($this) {
         $this.$groupBounds.data[0] = $this.$startIndex;
         $this.$groupBounds.data[1] = $this.$startIndex;
     }
-    jur_MatchResultImpl_checkGroup($this, 0);
+    $java.jur_MatchResultImpl_checkGroup($this, 0);
     $this.$previousMatch = $this.$groupBounds.data[1];
 };
 $java.jur_MatchResultImpl_getEnterCounter = function($this, $setCounter) {
@@ -200708,7 +200725,7 @@ $java.jur_MatchResultImpl_getEnterCounter = function($this, $setCounter) {
 $java.jur_MatchResultImpl_setEnterCounter = function($this, $setCounter, $value) {
     $this.$compQuantCounters.data[$setCounter] = $value;
 };
-function jur_MatchResultImpl_checkGroup($this, $group) {
+$java.jur_MatchResultImpl_checkGroup = function($this, $group) {
     var var$2, var$3, var$4;
     if (!$this.$valid) {
         var$2 = new jl_IllegalStateException;
@@ -200727,7 +200744,7 @@ function jur_MatchResultImpl_checkGroup($this, $group) {
     var$2.$writableStackTrace = 1;
     var$2.$message = var$4;
     $rt_throw(var$2);
-}
+};
 $java.jur_MatchResultImpl_setValid = function($this) {
     $this.$valid = 1;
 };
@@ -206008,16 +206025,16 @@ $java.jur_Matcher$1_toString = function($this) {
     var$1 = $this.$this$046;
     var$2 = $this.$grN;
     var$1 = var$1.$matchResult;
-    jur_MatchResultImpl_checkGroup(var$1, var$2);
+    $java.jur_MatchResultImpl_checkGroup(var$1, var$2);
     var$3 = var$1.$groupBounds.data;
     var$4 = var$2 * 2 | 0;
     if (var$3[var$4] < 0)
         var$1 = null;
     else {
         var$5 = var$1.$string4;
-        jur_MatchResultImpl_checkGroup(var$1, var$2);
+        $java.jur_MatchResultImpl_checkGroup(var$1, var$2);
         var$6 = var$1.$groupBounds.data[var$4];
-        jur_MatchResultImpl_checkGroup(var$1, var$2);
+        $java.jur_MatchResultImpl_checkGroup(var$1, var$2);
         var$4 = var$1.$groupBounds.data[var$4 + 1 | 0];
         if (var$6 > var$4) {
             var$1 = new jl_IndexOutOfBoundsException;
@@ -207148,66 +207165,6 @@ function maan_Instrument__clinit_() {
     var$3[9] = $java.maan_Instrument_XYLOPHONE;
     $java.maan_Instrument_$VALUES = var$2;
 }
-function nms_WorldType() {
-    var a = this; jl_Object.call(a);
-    a.$worldTypeId = 0;
-    a.$worldType = null;
-    a.$generatorVersion = 0;
-    a.$canBeCreated = 0;
-    a.$isWorldTypeVersioned = 0;
-}
-$java.nms_WorldType_worldTypes = null;
-$java.nms_WorldType_DEFAULT = null;
-var nms_WorldType_FLAT = null;
-$java.nms_WorldType_LARGE_BIOMES = null;
-$java.nms_WorldType_DEFAULT_1_1 = null;
-$java.nms_WorldType_getWorldTypeName = function($this) {
-    return $this.$worldType;
-};
-$java.nms_WorldType_parseWorldType = function($par0Str) {
-    var $var1;
-    $var1 = 0;
-    while ($var1 < $java.nms_WorldType_worldTypes.data.length) {
-        if ($java.nms_WorldType_worldTypes.data[$var1] !== null && jl_String_equalsIgnoreCase($java.nms_WorldType_worldTypes.data[$var1].$worldType, $par0Str))
-            return $java.nms_WorldType_worldTypes.data[$var1];
-        $var1 = $var1 + 1 | 0;
-    }
-    return null;
-};
-function nms_WorldType__clinit_() {
-    var var$1, var$2;
-    $java.nms_WorldType_worldTypes = $rt_createArray(nms_WorldType, 16);
-    var$1 = new nms_WorldType;
-    var$1.$worldType = $rt_s(1766);
-    var$1.$generatorVersion = 1;
-    var$1.$canBeCreated = 1;
-    var$1.$worldTypeId = 0;
-    $java.nms_WorldType_worldTypes.data[0] = var$1;
-    var$1.$isWorldTypeVersioned = 1;
-    $java.nms_WorldType_DEFAULT = var$1;
-    var$2 = new nms_WorldType;
-    var$2.$worldType = $rt_s(2845);
-    var$2.$generatorVersion = 0;
-    var$2.$canBeCreated = 1;
-    var$2.$worldTypeId = 1;
-    $java.nms_WorldType_worldTypes.data[1] = var$2;
-    nms_WorldType_FLAT = var$2;
-    var$2 = new nms_WorldType;
-    var$2.$worldType = $rt_s(2846);
-    var$2.$generatorVersion = 0;
-    var$2.$canBeCreated = 1;
-    var$2.$worldTypeId = 2;
-    $java.nms_WorldType_worldTypes.data[2] = var$2;
-    $java.nms_WorldType_LARGE_BIOMES = var$2;
-    var$2 = new nms_WorldType;
-    var$2.$worldType = $rt_s(2847);
-    var$2.$generatorVersion = 0;
-    var$2.$canBeCreated = 1;
-    var$2.$worldTypeId = 8;
-    $java.nms_WorldType_worldTypes.data[8] = var$2;
-    var$2.$canBeCreated = 0;
-    $java.nms_WorldType_DEFAULT_1_1 = var$2;
-}
 function nms_EnumGameType() {
     var a = this; jl_Enum.call(a);
     a.$id7 = 0;
@@ -207258,28 +207215,28 @@ $java.nms_EnumGameType_getByID = function($par0) {
 function nms_EnumGameType__clinit_() {
     var var$1, var$2, var$3;
     var$1 = new nms_EnumGameType;
-    var$1.$name2 = $rt_s(2848);
+    var$1.$name2 = $rt_s(2845);
     var$1.$ordinal = 0;
     var$1.$id7 = (-1);
     var$1.$name16 = $rt_s(44);
     $java.nms_EnumGameType_NOT_SET = var$1;
     var$1 = new nms_EnumGameType;
-    var$1.$name2 = $rt_s(2849);
+    var$1.$name2 = $rt_s(2846);
     var$1.$ordinal = 1;
     var$1.$id7 = 0;
-    var$1.$name16 = $rt_s(2850);
+    var$1.$name16 = $rt_s(2847);
     nms_EnumGameType_SURVIVAL = var$1;
     var$1 = new nms_EnumGameType;
-    var$1.$name2 = $rt_s(2851);
+    var$1.$name2 = $rt_s(2848);
     var$1.$ordinal = 2;
     var$1.$id7 = 1;
-    var$1.$name16 = $rt_s(2852);
+    var$1.$name16 = $rt_s(2849);
     nms_EnumGameType_CREATIVE = var$1;
     var$1 = new nms_EnumGameType;
-    var$1.$name2 = $rt_s(2853);
+    var$1.$name2 = $rt_s(2850);
     var$1.$ordinal = 3;
     var$1.$id7 = 2;
-    var$1.$name16 = $rt_s(2854);
+    var$1.$name16 = $rt_s(2851);
     nms_EnumGameType_ADVENTURE = var$1;
     var$2 = $rt_createArray(nms_EnumGameType, 4);
     var$3 = var$2.data;
@@ -207289,6 +207246,66 @@ function nms_EnumGameType__clinit_() {
     var$3[3] = nms_EnumGameType_ADVENTURE;
     $java.nms_EnumGameType_$VALUES = var$2;
 }
+function nms_WorldType() {
+    var a = this; jl_Object.call(a);
+    a.$worldTypeId = 0;
+    a.$worldType = null;
+    a.$generatorVersion = 0;
+    a.$canBeCreated = 0;
+    a.$isWorldTypeVersioned = 0;
+}
+$java.nms_WorldType_worldTypes = null;
+$java.nms_WorldType_DEFAULT = null;
+var nms_WorldType_FLAT = null;
+$java.nms_WorldType_LARGE_BIOMES = null;
+$java.nms_WorldType_DEFAULT_1_1 = null;
+$java.nms_WorldType_getWorldTypeName = function($this) {
+    return $this.$worldType;
+};
+$java.nms_WorldType_parseWorldType = function($par0Str) {
+    var $var1;
+    $var1 = 0;
+    while ($var1 < $java.nms_WorldType_worldTypes.data.length) {
+        if ($java.nms_WorldType_worldTypes.data[$var1] !== null && jl_String_equalsIgnoreCase($java.nms_WorldType_worldTypes.data[$var1].$worldType, $par0Str))
+            return $java.nms_WorldType_worldTypes.data[$var1];
+        $var1 = $var1 + 1 | 0;
+    }
+    return null;
+};
+function nms_WorldType__clinit_() {
+    var var$1, var$2;
+    $java.nms_WorldType_worldTypes = $rt_createArray(nms_WorldType, 16);
+    var$1 = new nms_WorldType;
+    var$1.$worldType = $rt_s(1766);
+    var$1.$generatorVersion = 1;
+    var$1.$canBeCreated = 1;
+    var$1.$worldTypeId = 0;
+    $java.nms_WorldType_worldTypes.data[0] = var$1;
+    var$1.$isWorldTypeVersioned = 1;
+    $java.nms_WorldType_DEFAULT = var$1;
+    var$2 = new nms_WorldType;
+    var$2.$worldType = $rt_s(2852);
+    var$2.$generatorVersion = 0;
+    var$2.$canBeCreated = 1;
+    var$2.$worldTypeId = 1;
+    $java.nms_WorldType_worldTypes.data[1] = var$2;
+    nms_WorldType_FLAT = var$2;
+    var$2 = new nms_WorldType;
+    var$2.$worldType = $rt_s(2853);
+    var$2.$generatorVersion = 0;
+    var$2.$canBeCreated = 1;
+    var$2.$worldTypeId = 2;
+    $java.nms_WorldType_worldTypes.data[2] = var$2;
+    $java.nms_WorldType_LARGE_BIOMES = var$2;
+    var$2 = new nms_WorldType;
+    var$2.$worldType = $rt_s(2854);
+    var$2.$generatorVersion = 0;
+    var$2.$canBeCreated = 1;
+    var$2.$worldTypeId = 8;
+    $java.nms_WorldType_worldTypes.data[8] = var$2;
+    var$2.$canBeCreated = 0;
+    $java.nms_WorldType_DEFAULT_1_1 = var$2;
+}
 function nms_InventoryCrafting() {
     var a = this; jl_Object.call(a);
     a.$stackList = null;
@@ -207869,27 +207886,6 @@ function nms_EntitySenses_clearSensingCache($this) {
 function cjj_GZIPInputStream() {
     cjj_InflaterInputStream.call(this);
 }
-$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_GuiWinGame() {
     var a = this; nms_GuiScreen.call(a);
     a.$updateCounter3 = 0;
@@ -208270,318 +208266,6 @@ 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;
-    a.$currentLife = 0;
-    a.$maximumLife = 0;
-    a.$particleName0 = null;
-}
-$java.nms_EntityCrit2FX__init_ = function(var_0, var_1, var_2) {
-    var var_3 = new nms_EntityCrit2FX();
-    nms_EntityCrit2FX__init_(var_3, var_0, var_1, var_2);
-    return var_3;
-};
-function nms_EntityCrit2FX__init_($this, $par1World, $par2Entity, $par3Str) {
-    var $ptr, $tmp;
-    $ptr = 0;
-    if ($rt_resuming()) {
-        var $thread = $rt_nativeThread();
-        $ptr = $thread.pop();$par3Str = $thread.pop();$par2Entity = $thread.pop();$par1World = $thread.pop();$this = $thread.pop();
-    }
-    main: while (true) { switch ($ptr) {
-    case 0:
-        $java.nms_EntityFX__init_2($this, $par1World, $par2Entity.$posX, $par2Entity.$boundingBox.$minY + $par2Entity.$height1 / 2.0, $par2Entity.$posZ, $par2Entity.$motionX, $par2Entity.$motionY, $par2Entity.$motionZ);
-        $this.$currentLife = 0;
-        $this.$maximumLife = 0;
-        $this.$theEntity = $par2Entity;
-        $this.$maximumLife = 3;
-        $this.$particleName0 = $par3Str;
-        $ptr = 1;
-    case 1:
-        $java.nms_EntityCrit2FX_onUpdate($this);
-        if ($rt_suspending()) {
-            break main;
-        }
-        return;
-    default: $rt_invalidPointer();
-    }}
-    $rt_nativeThread().push($this, $par1World, $par2Entity, $par3Str, $ptr);
-}
-$java.nms_EntityCrit2FX_renderParticle = function($this, $par1Tessellator, $par2, $par3, $par4, $par5, $par6, $par7) {
-    return;
-};
-$java.nms_EntityCrit2FX_onUpdate = function($this) {
-    var $var1, var$2, var$3, $var2, $var4, $var6, $var8, $var10, $var12, var$10, var$11, var$12, var$13, $ptr, $tmp;
-    $ptr = 0;
-    if ($rt_resuming()) {
-        var $thread = $rt_nativeThread();
-        $ptr = $thread.pop();var$13 = $thread.pop();var$12 = $thread.pop();var$11 = $thread.pop();var$10 = $thread.pop();$var12 = $thread.pop();$var10 = $thread.pop();$var8 = $thread.pop();$var6 = $thread.pop();$var4 = $thread.pop();$var2 = $thread.pop();var$3 = $thread.pop();var$2 = $thread.pop();$var1 = $thread.pop();$this = $thread.pop();
-    }
-    main: while (true) { switch ($ptr) {
-    case 0:
-        $var1 = 0;
-        var$2 = 24;
-        while ($var1 < 16) {
-            var$3 = $this.$rand0;
-            var$3.$seed = Long_and(Long_add(Long_mul(var$3.$seed, new Long(3740067437, 5)), Long_fromInt(11)), new Long(4294967295, 65535));
-            $var2 = Long_shru(var$3.$seed, var$2).lo / 1.6777216E7 * 2.0 - 1.0;
-            var$3 = $this.$rand0;
-            var$3.$seed = Long_and(Long_add(Long_mul(var$3.$seed, new Long(3740067437, 5)), Long_fromInt(11)), new Long(4294967295, 65535));
-            $var4 = Long_shru(var$3.$seed, var$2).lo / 1.6777216E7 * 2.0 - 1.0;
-            var$3 = $this.$rand0;
-            var$3.$seed = Long_and(Long_add(Long_mul(var$3.$seed, new Long(3740067437, 5)), Long_fromInt(11)), new Long(4294967295, 65535));
-            $var6 = Long_shru(var$3.$seed, var$2).lo / 1.6777216E7 * 2.0 - 1.0;
-            if ($var2 * $var2 + $var4 * $var4 + $var6 * $var6 <= 1.0) {
-                $var8 = $this.$theEntity.$posX + $var2 * $this.$theEntity.$width1 / 4.0;
-                $var10 = $this.$theEntity.$boundingBox.$minY + $this.$theEntity.$height1 / 2.0 + $var4 * $this.$theEntity.$height1 / 4.0;
-                $var12 = $this.$theEntity.$posZ + $var6 * $this.$theEntity.$width1 / 4.0;
-                var$3 = $this.$worldObj;
-                var$10 = $this.$particleName0;
-                var$11 = $var4 + 0.2;
-                var$12 = 0;
-                if (var$12 < var$3.$worldAccesses.$size0) {
-                    var$13 = var$3.$worldAccesses;
-                    if (var$12 >= 0 && var$12 < var$13.$size0) {
-                        var$13 = var$13.$array1.data[var$12];
-                        $ptr = 1;
-                        continue main;
-                    }
-                    var$3 = new jl_IndexOutOfBoundsException;
-                    var$3.$suppressionEnabled = 1;
-                    var$3.$writableStackTrace = 1;
-                    $rt_throw(var$3);
-                }
-            }
-            $var1 = $var1 + 1 | 0;
-        }
-        $this.$currentLife = $this.$currentLife + 1 | 0;
-        if ($this.$currentLife >= $this.$maximumLife)
-            $this.$isDead = 1;
-        return;
-    case 1:
-        nms_RenderGlobal_doSpawnParticle(var$13, var$10, $var8, $var10, $var12, $var2, var$11, $var6);
-        if ($rt_suspending()) {
-            break main;
-        }
-        var$12 = var$12 + 1 | 0;
-        a: while (true) {
-            if (var$12 < var$3.$worldAccesses.$size0) {
-                var$13 = var$3.$worldAccesses;
-                if (var$12 >= 0 && var$12 < var$13.$size0) {
-                    var$13 = var$13.$array1.data[var$12];
-                    continue main;
-                }
-                var$3 = new jl_IndexOutOfBoundsException;
-                var$3.$suppressionEnabled = 1;
-                var$3.$writableStackTrace = 1;
-                $rt_throw(var$3);
-            }
-            while (true) {
-                $var1 = $var1 + 1 | 0;
-                if ($var1 >= 16)
-                    break a;
-                var$3 = $this.$rand0;
-                var$3.$seed = Long_and(Long_add(Long_mul(var$3.$seed, new Long(3740067437, 5)), Long_fromInt(11)), new Long(4294967295, 65535));
-                $var2 = Long_shru(var$3.$seed, var$2).lo / 1.6777216E7 * 2.0 - 1.0;
-                var$3 = $this.$rand0;
-                var$3.$seed = Long_and(Long_add(Long_mul(var$3.$seed, new Long(3740067437, 5)), Long_fromInt(11)), new Long(4294967295, 65535));
-                $var4 = Long_shru(var$3.$seed, var$2).lo / 1.6777216E7 * 2.0 - 1.0;
-                var$3 = $this.$rand0;
-                var$3.$seed = Long_and(Long_add(Long_mul(var$3.$seed, new Long(3740067437, 5)), Long_fromInt(11)), new Long(4294967295, 65535));
-                $var6 = Long_shru(var$3.$seed, var$2).lo / 1.6777216E7 * 2.0 - 1.0;
-                if ($var2 * $var2 + $var4 * $var4 + $var6 * $var6 > 1.0)
-                    continue;
-                else
-                    break;
-            }
-            $var8 = $this.$theEntity.$posX + $var2 * $this.$theEntity.$width1 / 4.0;
-            $var10 = $this.$theEntity.$boundingBox.$minY + $this.$theEntity.$height1 / 2.0 + $var4 * $this.$theEntity.$height1 / 4.0;
-            $var12 = $this.$theEntity.$posZ + $var6 * $this.$theEntity.$width1 / 4.0;
-            var$3 = $this.$worldObj;
-            var$10 = $this.$particleName0;
-            var$11 = $var4 + 0.2;
-            var$12 = 0;
-        }
-        $this.$currentLife = $this.$currentLife + 1 | 0;
-        if ($this.$currentLife >= $this.$maximumLife)
-            $this.$isDead = 1;
-        return;
-    default: $rt_invalidPointer();
-    }}
-    $rt_nativeThread().push($this, $var1, var$2, var$3, $var2, $var4, $var6, $var8, $var10, $var12, var$10, var$11, var$12, var$13, $ptr);
-};
-$java.nms_EntityCrit2FX_getFXLayer = function($this) {
-    return 3;
-};
 function nms_Explosion() {
     var a = this; jl_Object.call(a);
     a.$isFlaming = 0;
@@ -209247,6 +208931,333 @@ 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;
 }
+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);
+}
+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;
+}
+function nms_EntityCrit2FX() {
+    var a = this; nms_EntityFX.call(a);
+    a.$theEntity = null;
+    a.$currentLife = 0;
+    a.$maximumLife = 0;
+    a.$particleName0 = null;
+}
+$java.nms_EntityCrit2FX__init_ = function(var_0, var_1, var_2) {
+    var var_3 = new nms_EntityCrit2FX();
+    nms_EntityCrit2FX__init_(var_3, var_0, var_1, var_2);
+    return var_3;
+};
+function nms_EntityCrit2FX__init_($this, $par1World, $par2Entity, $par3Str) {
+    var $ptr, $tmp;
+    $ptr = 0;
+    if ($rt_resuming()) {
+        var $thread = $rt_nativeThread();
+        $ptr = $thread.pop();$par3Str = $thread.pop();$par2Entity = $thread.pop();$par1World = $thread.pop();$this = $thread.pop();
+    }
+    main: while (true) { switch ($ptr) {
+    case 0:
+        $java.nms_EntityFX__init_2($this, $par1World, $par2Entity.$posX, $par2Entity.$boundingBox.$minY + $par2Entity.$height1 / 2.0, $par2Entity.$posZ, $par2Entity.$motionX, $par2Entity.$motionY, $par2Entity.$motionZ);
+        $this.$currentLife = 0;
+        $this.$maximumLife = 0;
+        $this.$theEntity = $par2Entity;
+        $this.$maximumLife = 3;
+        $this.$particleName0 = $par3Str;
+        $ptr = 1;
+    case 1:
+        $java.nms_EntityCrit2FX_onUpdate($this);
+        if ($rt_suspending()) {
+            break main;
+        }
+        return;
+    default: $rt_invalidPointer();
+    }}
+    $rt_nativeThread().push($this, $par1World, $par2Entity, $par3Str, $ptr);
+}
+$java.nms_EntityCrit2FX_renderParticle = function($this, $par1Tessellator, $par2, $par3, $par4, $par5, $par6, $par7) {
+    return;
+};
+$java.nms_EntityCrit2FX_onUpdate = function($this) {
+    var $var1, var$2, var$3, $var2, $var4, $var6, $var8, $var10, $var12, var$10, var$11, var$12, var$13, $ptr, $tmp;
+    $ptr = 0;
+    if ($rt_resuming()) {
+        var $thread = $rt_nativeThread();
+        $ptr = $thread.pop();var$13 = $thread.pop();var$12 = $thread.pop();var$11 = $thread.pop();var$10 = $thread.pop();$var12 = $thread.pop();$var10 = $thread.pop();$var8 = $thread.pop();$var6 = $thread.pop();$var4 = $thread.pop();$var2 = $thread.pop();var$3 = $thread.pop();var$2 = $thread.pop();$var1 = $thread.pop();$this = $thread.pop();
+    }
+    main: while (true) { switch ($ptr) {
+    case 0:
+        $var1 = 0;
+        var$2 = 24;
+        while ($var1 < 16) {
+            var$3 = $this.$rand0;
+            var$3.$seed = Long_and(Long_add(Long_mul(var$3.$seed, new Long(3740067437, 5)), Long_fromInt(11)), new Long(4294967295, 65535));
+            $var2 = Long_shru(var$3.$seed, var$2).lo / 1.6777216E7 * 2.0 - 1.0;
+            var$3 = $this.$rand0;
+            var$3.$seed = Long_and(Long_add(Long_mul(var$3.$seed, new Long(3740067437, 5)), Long_fromInt(11)), new Long(4294967295, 65535));
+            $var4 = Long_shru(var$3.$seed, var$2).lo / 1.6777216E7 * 2.0 - 1.0;
+            var$3 = $this.$rand0;
+            var$3.$seed = Long_and(Long_add(Long_mul(var$3.$seed, new Long(3740067437, 5)), Long_fromInt(11)), new Long(4294967295, 65535));
+            $var6 = Long_shru(var$3.$seed, var$2).lo / 1.6777216E7 * 2.0 - 1.0;
+            if ($var2 * $var2 + $var4 * $var4 + $var6 * $var6 <= 1.0) {
+                $var8 = $this.$theEntity.$posX + $var2 * $this.$theEntity.$width1 / 4.0;
+                $var10 = $this.$theEntity.$boundingBox.$minY + $this.$theEntity.$height1 / 2.0 + $var4 * $this.$theEntity.$height1 / 4.0;
+                $var12 = $this.$theEntity.$posZ + $var6 * $this.$theEntity.$width1 / 4.0;
+                var$3 = $this.$worldObj;
+                var$10 = $this.$particleName0;
+                var$11 = $var4 + 0.2;
+                var$12 = 0;
+                if (var$12 < var$3.$worldAccesses.$size0) {
+                    var$13 = var$3.$worldAccesses;
+                    if (var$12 >= 0 && var$12 < var$13.$size0) {
+                        var$13 = var$13.$array1.data[var$12];
+                        $ptr = 1;
+                        continue main;
+                    }
+                    var$3 = new jl_IndexOutOfBoundsException;
+                    var$3.$suppressionEnabled = 1;
+                    var$3.$writableStackTrace = 1;
+                    $rt_throw(var$3);
+                }
+            }
+            $var1 = $var1 + 1 | 0;
+        }
+        $this.$currentLife = $this.$currentLife + 1 | 0;
+        if ($this.$currentLife >= $this.$maximumLife)
+            $this.$isDead = 1;
+        return;
+    case 1:
+        nms_RenderGlobal_doSpawnParticle(var$13, var$10, $var8, $var10, $var12, $var2, var$11, $var6);
+        if ($rt_suspending()) {
+            break main;
+        }
+        var$12 = var$12 + 1 | 0;
+        a: while (true) {
+            if (var$12 < var$3.$worldAccesses.$size0) {
+                var$13 = var$3.$worldAccesses;
+                if (var$12 >= 0 && var$12 < var$13.$size0) {
+                    var$13 = var$13.$array1.data[var$12];
+                    continue main;
+                }
+                var$3 = new jl_IndexOutOfBoundsException;
+                var$3.$suppressionEnabled = 1;
+                var$3.$writableStackTrace = 1;
+                $rt_throw(var$3);
+            }
+            while (true) {
+                $var1 = $var1 + 1 | 0;
+                if ($var1 >= 16)
+                    break a;
+                var$3 = $this.$rand0;
+                var$3.$seed = Long_and(Long_add(Long_mul(var$3.$seed, new Long(3740067437, 5)), Long_fromInt(11)), new Long(4294967295, 65535));
+                $var2 = Long_shru(var$3.$seed, var$2).lo / 1.6777216E7 * 2.0 - 1.0;
+                var$3 = $this.$rand0;
+                var$3.$seed = Long_and(Long_add(Long_mul(var$3.$seed, new Long(3740067437, 5)), Long_fromInt(11)), new Long(4294967295, 65535));
+                $var4 = Long_shru(var$3.$seed, var$2).lo / 1.6777216E7 * 2.0 - 1.0;
+                var$3 = $this.$rand0;
+                var$3.$seed = Long_and(Long_add(Long_mul(var$3.$seed, new Long(3740067437, 5)), Long_fromInt(11)), new Long(4294967295, 65535));
+                $var6 = Long_shru(var$3.$seed, var$2).lo / 1.6777216E7 * 2.0 - 1.0;
+                if ($var2 * $var2 + $var4 * $var4 + $var6 * $var6 > 1.0)
+                    continue;
+                else
+                    break;
+            }
+            $var8 = $this.$theEntity.$posX + $var2 * $this.$theEntity.$width1 / 4.0;
+            $var10 = $this.$theEntity.$boundingBox.$minY + $this.$theEntity.$height1 / 2.0 + $var4 * $this.$theEntity.$height1 / 4.0;
+            $var12 = $this.$theEntity.$posZ + $var6 * $this.$theEntity.$width1 / 4.0;
+            var$3 = $this.$worldObj;
+            var$10 = $this.$particleName0;
+            var$11 = $var4 + 0.2;
+            var$12 = 0;
+        }
+        $this.$currentLife = $this.$currentLife + 1 | 0;
+        if ($this.$currentLife >= $this.$maximumLife)
+            $this.$isDead = 1;
+        return;
+    default: $rt_invalidPointer();
+    }}
+    $rt_nativeThread().push($this, $var1, var$2, var$3, $var2, $var4, $var6, $var8, $var10, $var12, var$10, var$11, var$12, var$13, $ptr);
+};
+$java.nms_EntityCrit2FX_getFXLayer = function($this) {
+    return 3;
+};
+$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_GuiMerchant() {
     var a = this; nms_GuiContainer.call(a);
     a.$theIMerchant = null;
@@ -209888,21 +209899,27 @@ $java.nms_EntityPickupFX_onUpdate = function($this) {
 $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;
+$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_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;
@@ -209942,6 +209959,88 @@ $java.nms_GameRuleValue_setValue = function($this, $par1Str) {
 $java.nms_GameRuleValue_getGameRuleBooleanValue = function($this) {
     return $this.$valueBoolean;
 };
+function nms_MerchantRecipe() {
+    var a = this; jl_Object.call(a);
+    a.$itemToBuy = null;
+    a.$secondItemToBuy = null;
+    a.$itemToSell = null;
+    a.$toolUses = 0;
+    a.$maxTradeUses = 0;
+}
+function nms_MerchantRecipe__init_(var_0, var_1, var_2) {
+    var var_3 = new nms_MerchantRecipe();
+    $java.nms_MerchantRecipe__init_(var_3, var_0, var_1, var_2);
+    return var_3;
+}
+$java.nms_MerchantRecipe__init_ = function($this, $par1ItemStack, $par2ItemStack, $par3ItemStack) {
+    $this.$itemToBuy = $par1ItemStack;
+    $this.$secondItemToBuy = $par2ItemStack;
+    $this.$itemToSell = $par3ItemStack;
+    $this.$maxTradeUses = 7;
+};
+$java.nms_MerchantRecipe_getItemToBuy = function($this) {
+    return $this.$itemToBuy;
+};
+$java.nms_MerchantRecipe_getSecondItemToBuy = function($this) {
+    return $this.$secondItemToBuy;
+};
+$java.nms_MerchantRecipe_hasSecondItemToBuy = function($this) {
+    return $this.$secondItemToBuy === null ? 0 : 1;
+};
+$java.nms_MerchantRecipe_getItemToSell = function($this) {
+    return $this.$itemToSell;
+};
+function nms_MerchantRecipe_hasSameIDsAs($this, $par1MerchantRecipe) {
+    var var$2;
+    a: {
+        if ($this.$itemToBuy.$itemID0 == $par1MerchantRecipe.$itemToBuy.$itemID0 && $this.$itemToSell.$itemID0 == $par1MerchantRecipe.$itemToSell.$itemID0) {
+            b: {
+                if (!($this.$secondItemToBuy === null && $par1MerchantRecipe.$secondItemToBuy === null)) {
+                    if ($this.$secondItemToBuy === null)
+                        break b;
+                    if ($par1MerchantRecipe.$secondItemToBuy === null)
+                        break b;
+                    if ($this.$secondItemToBuy.$itemID0 != $par1MerchantRecipe.$secondItemToBuy.$itemID0)
+                        break b;
+                }
+                var$2 = 1;
+                break a;
+            }
+            var$2 = 0;
+        } else
+            var$2 = 0;
+    }
+    return var$2;
+}
+$java.nms_MerchantRecipe_hasSameItemsAs = function($this, $par1MerchantRecipe) {
+    var var$2;
+    a: {
+        b: {
+            if (nms_MerchantRecipe_hasSameIDsAs($this, $par1MerchantRecipe)) {
+                if ($this.$itemToBuy.$stackSize < $par1MerchantRecipe.$itemToBuy.$stackSize)
+                    break b;
+                if ($this.$secondItemToBuy !== null && $this.$secondItemToBuy.$stackSize < $par1MerchantRecipe.$secondItemToBuy.$stackSize)
+                    break b;
+            }
+            var$2 = 0;
+            break a;
+        }
+        var$2 = 1;
+    }
+    return var$2;
+};
+$java.nms_MerchantRecipe_incrementToolUses = function($this) {
+    $this.$toolUses = $this.$toolUses + 1 | 0;
+};
+$java.nms_MerchantRecipe_func_82783_a = function($this, $par1) {
+    $this.$maxTradeUses = $this.$maxTradeUses + $par1 | 0;
+};
+$java.nms_MerchantRecipe_func_82784_g = function($this) {
+    return $this.$toolUses < $this.$maxTradeUses ? 0 : 1;
+};
+$java.nms_MerchantRecipe_func_82785_h = function($this) {
+    $this.$toolUses = $this.$maxTradeUses;
+};
 $java.nms_InventoryMerchant = function() {
     var a = this; jl_Object.call(a);
     a.$theMerchant = null;
@@ -210065,197 +210164,6 @@ $java.nms_InventoryMerchant_setCurrentRecipeIndex = function($this, $par1) {
     $this.$currentRecipeIndex0 = $par1;
     $java.nms_InventoryMerchant_resetRecipeAndSlots($this);
 };
-function nms_MerchantRecipe() {
-    var a = this; jl_Object.call(a);
-    a.$itemToBuy = null;
-    a.$secondItemToBuy = null;
-    a.$itemToSell = null;
-    a.$toolUses = 0;
-    a.$maxTradeUses = 0;
-}
-function nms_MerchantRecipe__init_(var_0, var_1, var_2) {
-    var var_3 = new nms_MerchantRecipe();
-    $java.nms_MerchantRecipe__init_(var_3, var_0, var_1, var_2);
-    return var_3;
-}
-$java.nms_MerchantRecipe__init_ = function($this, $par1ItemStack, $par2ItemStack, $par3ItemStack) {
-    $this.$itemToBuy = $par1ItemStack;
-    $this.$secondItemToBuy = $par2ItemStack;
-    $this.$itemToSell = $par3ItemStack;
-    $this.$maxTradeUses = 7;
-};
-$java.nms_MerchantRecipe_getItemToBuy = function($this) {
-    return $this.$itemToBuy;
-};
-$java.nms_MerchantRecipe_getSecondItemToBuy = function($this) {
-    return $this.$secondItemToBuy;
-};
-$java.nms_MerchantRecipe_hasSecondItemToBuy = function($this) {
-    return $this.$secondItemToBuy === null ? 0 : 1;
-};
-$java.nms_MerchantRecipe_getItemToSell = function($this) {
-    return $this.$itemToSell;
-};
-function nms_MerchantRecipe_hasSameIDsAs($this, $par1MerchantRecipe) {
-    var var$2;
-    a: {
-        if ($this.$itemToBuy.$itemID0 == $par1MerchantRecipe.$itemToBuy.$itemID0 && $this.$itemToSell.$itemID0 == $par1MerchantRecipe.$itemToSell.$itemID0) {
-            b: {
-                if (!($this.$secondItemToBuy === null && $par1MerchantRecipe.$secondItemToBuy === null)) {
-                    if ($this.$secondItemToBuy === null)
-                        break b;
-                    if ($par1MerchantRecipe.$secondItemToBuy === null)
-                        break b;
-                    if ($this.$secondItemToBuy.$itemID0 != $par1MerchantRecipe.$secondItemToBuy.$itemID0)
-                        break b;
-                }
-                var$2 = 1;
-                break a;
-            }
-            var$2 = 0;
-        } else
-            var$2 = 0;
-    }
-    return var$2;
-}
-$java.nms_MerchantRecipe_hasSameItemsAs = function($this, $par1MerchantRecipe) {
-    var var$2;
-    a: {
-        b: {
-            if (nms_MerchantRecipe_hasSameIDsAs($this, $par1MerchantRecipe)) {
-                if ($this.$itemToBuy.$stackSize < $par1MerchantRecipe.$itemToBuy.$stackSize)
-                    break b;
-                if ($this.$secondItemToBuy !== null && $this.$secondItemToBuy.$stackSize < $par1MerchantRecipe.$secondItemToBuy.$stackSize)
-                    break b;
-            }
-            var$2 = 0;
-            break a;
-        }
-        var$2 = 1;
-    }
-    return var$2;
-};
-$java.nms_MerchantRecipe_incrementToolUses = function($this) {
-    $this.$toolUses = $this.$toolUses + 1 | 0;
-};
-$java.nms_MerchantRecipe_func_82783_a = function($this, $par1) {
-    $this.$maxTradeUses = $this.$maxTradeUses + $par1 | 0;
-};
-$java.nms_MerchantRecipe_func_82784_g = function($this) {
-    return $this.$toolUses < $this.$maxTradeUses ? 0 : 1;
-};
-$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);
-}
-$java.nms_WorldProviderHell__init_ = function() {
-    var var_0 = new nms_WorldProviderHell();
-    nms_WorldProviderHell__init_(var_0);
-    return var_0;
-};
-function nms_WorldProviderHell__init_($this) {
-    $this.$isHellWorld = 0;
-    $this.$hasNoSky = 0;
-    $this.$lightBrightnessTable = $rt_createFloatArray(16);
-    $this.$dimensionId = 0;
-    $this.$colorsSunriseSunset = $rt_createFloatArray(4);
-}
-$java.nms_WorldProviderHell_registerWorldChunkManager = function($this) {
-    $this.$isHellWorld = 1;
-    $this.$hasNoSky = 1;
-    $this.$dimensionId = (-1);
-};
-$java.nms_WorldProviderHell_getFogColor = function($this, $par1, $par2) {
-    return nms_Vec3Pool_getVecFromPool($this.$worldObj0.$vecPool, 0.20000000298023224, 0.029999999329447746, 0.029999999329447746);
-};
-$java.nms_WorldProviderHell_generateLightBrightnessTable = function($this) {
-    var $var2, $var3;
-    $var2 = 0;
-    while ($var2 <= 15) {
-        $var3 = 1.0 - $var2 / 15.0;
-        $this.$lightBrightnessTable.data[$var2] = (1.0 - $var3) / ($var3 * 3.0 + 1.0) * 0.8999999761581421 + 0.10000000149011612;
-        $var2 = $var2 + 1 | 0;
-    }
-};
-$java.nms_WorldProviderHell_isSurfaceWorld = function($this) {
-    return 0;
-};
-$java.nms_WorldProviderHell_calculateCelestialAngle = function($this, $par1, $par3) {
-    return 0.5;
-};
-$java.nms_WorldProviderHell_canRespawnHere = function($this) {
-    return 0;
-};
-$java.nms_WorldProviderHell_doesXZShowFog = function($this, $par1, $par2) {
-    return 1;
-};
-function nms_WorldProviderEnd() {
-    nms_WorldProvider.call(this);
-}
-$java.nms_WorldProviderEnd__init_ = function() {
-    var var_0 = new nms_WorldProviderEnd();
-    nms_WorldProviderEnd__init_(var_0);
-    return var_0;
-};
-function nms_WorldProviderEnd__init_($this) {
-    $this.$isHellWorld = 0;
-    $this.$hasNoSky = 0;
-    $this.$lightBrightnessTable = $rt_createFloatArray(16);
-    $this.$dimensionId = 0;
-    $this.$colorsSunriseSunset = $rt_createFloatArray(4);
-}
-$java.nms_WorldProviderEnd_registerWorldChunkManager = function($this) {
-    $this.$dimensionId = 1;
-    $this.$hasNoSky = 1;
-};
-$java.nms_WorldProviderEnd_calculateCelestialAngle = function($this, $par1, $par3) {
-    return 0.0;
-};
-$java.nms_WorldProviderEnd_calcSunriseSunsetColors = function($this, $par1, $par2) {
-    return null;
-};
-$java.nms_WorldProviderEnd_getFogColor = function($this, $par1, $par2) {
-    var $var4, var$4, var$5;
-    $par1 = $par1 * 3.1415927410125732 * 2.0;
-    $var4 = nms_MathHelper_SIN_TABLE.data[($par1 * 10430.3779296875 + 16384.0 | 0) & 65535] * 2.0 + 0.5;
-    if ($var4 < 0.0)
-        $var4 = 0.0;
-    if ($var4 > 1.0)
-        $var4 = 1.0;
-    $par1 = $var4 * 0.0 + 0.15000000596046448;
-    $par2 = 0.6274510025978088 * $par1;
-    $par1 = 0.501960813999176 * $par1;
-    var$4 = $this.$worldObj0.$vecPool;
-    var$5 = $par2;
-    return nms_Vec3Pool_getVecFromPool(var$4, var$5, $par1, var$5);
-};
-$java.nms_WorldProviderEnd_isSkyColored = function($this) {
-    return 0;
-};
-$java.nms_WorldProviderEnd_canRespawnHere = function($this) {
-    return 0;
-};
-$java.nms_WorldProviderEnd_isSurfaceWorld = function($this) {
-    return 0;
-};
-$java.nms_WorldProviderEnd_getCloudHeight = function($this) {
-    return 8.0;
-};
-$java.nms_WorldProviderEnd_doesXZShowFog = function($this, $par1, $par2) {
-    return 1;
-};
 function nms_InventoryEnderChest() {
     $java.nms_InventoryBasic.call(this);
     this.$associatedChest = null;
@@ -210730,6 +210638,115 @@ $java.nms_ContainerPlayer_transferStackInSlot = function($this, $par1EntityPlaye
 $java.nms_ContainerPlayer_func_94530_a = function($this, $par1ItemStack, $par2Slot) {
     return $par2Slot.$inventory0 === $this.$craftResult ? 0 : 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_WorldProviderHell() {
+    nms_WorldProvider.call(this);
+}
+$java.nms_WorldProviderHell__init_ = function() {
+    var var_0 = new nms_WorldProviderHell();
+    nms_WorldProviderHell__init_(var_0);
+    return var_0;
+};
+function nms_WorldProviderHell__init_($this) {
+    $this.$isHellWorld = 0;
+    $this.$hasNoSky = 0;
+    $this.$lightBrightnessTable = $rt_createFloatArray(16);
+    $this.$dimensionId = 0;
+    $this.$colorsSunriseSunset = $rt_createFloatArray(4);
+}
+$java.nms_WorldProviderHell_registerWorldChunkManager = function($this) {
+    $this.$isHellWorld = 1;
+    $this.$hasNoSky = 1;
+    $this.$dimensionId = (-1);
+};
+$java.nms_WorldProviderHell_getFogColor = function($this, $par1, $par2) {
+    return nms_Vec3Pool_getVecFromPool($this.$worldObj0.$vecPool, 0.20000000298023224, 0.029999999329447746, 0.029999999329447746);
+};
+$java.nms_WorldProviderHell_generateLightBrightnessTable = function($this) {
+    var $var2, $var3;
+    $var2 = 0;
+    while ($var2 <= 15) {
+        $var3 = 1.0 - $var2 / 15.0;
+        $this.$lightBrightnessTable.data[$var2] = (1.0 - $var3) / ($var3 * 3.0 + 1.0) * 0.8999999761581421 + 0.10000000149011612;
+        $var2 = $var2 + 1 | 0;
+    }
+};
+$java.nms_WorldProviderHell_isSurfaceWorld = function($this) {
+    return 0;
+};
+$java.nms_WorldProviderHell_calculateCelestialAngle = function($this, $par1, $par3) {
+    return 0.5;
+};
+$java.nms_WorldProviderHell_canRespawnHere = function($this) {
+    return 0;
+};
+$java.nms_WorldProviderHell_doesXZShowFog = function($this, $par1, $par2) {
+    return 1;
+};
+function nms_WorldProviderEnd() {
+    nms_WorldProvider.call(this);
+}
+$java.nms_WorldProviderEnd__init_ = function() {
+    var var_0 = new nms_WorldProviderEnd();
+    nms_WorldProviderEnd__init_(var_0);
+    return var_0;
+};
+function nms_WorldProviderEnd__init_($this) {
+    $this.$isHellWorld = 0;
+    $this.$hasNoSky = 0;
+    $this.$lightBrightnessTable = $rt_createFloatArray(16);
+    $this.$dimensionId = 0;
+    $this.$colorsSunriseSunset = $rt_createFloatArray(4);
+}
+$java.nms_WorldProviderEnd_registerWorldChunkManager = function($this) {
+    $this.$dimensionId = 1;
+    $this.$hasNoSky = 1;
+};
+$java.nms_WorldProviderEnd_calculateCelestialAngle = function($this, $par1, $par3) {
+    return 0.0;
+};
+$java.nms_WorldProviderEnd_calcSunriseSunsetColors = function($this, $par1, $par2) {
+    return null;
+};
+$java.nms_WorldProviderEnd_getFogColor = function($this, $par1, $par2) {
+    var $var4, var$4, var$5;
+    $par1 = $par1 * 3.1415927410125732 * 2.0;
+    $var4 = nms_MathHelper_SIN_TABLE.data[($par1 * 10430.3779296875 + 16384.0 | 0) & 65535] * 2.0 + 0.5;
+    if ($var4 < 0.0)
+        $var4 = 0.0;
+    if ($var4 > 1.0)
+        $var4 = 1.0;
+    $par1 = $var4 * 0.0 + 0.15000000596046448;
+    $par2 = 0.6274510025978088 * $par1;
+    $par1 = 0.501960813999176 * $par1;
+    var$4 = $this.$worldObj0.$vecPool;
+    var$5 = $par2;
+    return nms_Vec3Pool_getVecFromPool(var$4, var$5, $par1, var$5);
+};
+$java.nms_WorldProviderEnd_isSkyColored = function($this) {
+    return 0;
+};
+$java.nms_WorldProviderEnd_canRespawnHere = function($this) {
+    return 0;
+};
+$java.nms_WorldProviderEnd_isSurfaceWorld = function($this) {
+    return 0;
+};
+$java.nms_WorldProviderEnd_getCloudHeight = function($this) {
+    return 8.0;
+};
+$java.nms_WorldProviderEnd_doesXZShowFog = function($this, $par1, $par2) {
+    return 1;
+};
 function nms_InventoryCraftResult() {
     jl_Object.call(this);
     this.$stackResult = null;
@@ -220228,6 +220245,519 @@ function nms_EnumCreatureAttribute__clinit_() {
     var$3[2] = nms_EnumCreatureAttribute_ARTHROPOD;
     $java.nms_EnumCreatureAttribute_$VALUES = var$2;
 }
+function nms_BlockBaseRailLogic() {
+    var a = this; jl_Object.call(a);
+    a.$logicWorld = null;
+    a.$railX = 0;
+    a.$railY = 0;
+    a.$railZ = 0;
+    a.$isStraightRail = 0;
+    a.$railChunkPosition = null;
+    a.$theRail = null;
+}
+function nms_BlockBaseRailLogic__init_(var_0, var_1, var_2, var_3, var_4) {
+    var var_5 = new nms_BlockBaseRailLogic();
+    $java.nms_BlockBaseRailLogic__init_(var_5, var_0, var_1, var_2, var_3, var_4);
+    return var_5;
+}
+$java.nms_BlockBaseRailLogic__init_ = function($this, $par1, $par2, $par3, $par4, $par5) {
+    var $var6, $var7;
+    $this.$theRail = $par1;
+    $par1 = new ju_ArrayList;
+    $par1.$array1 = $rt_createArray(jl_Object, 10);
+    $this.$railChunkPosition = $par1;
+    $this.$logicWorld = $par2;
+    $this.$railX = $par3;
+    $this.$railY = $par4;
+    $this.$railZ = $par5;
+    $var6 = nms_World_getBlockId($par2, $par3, $par4, $par5);
+    $var7 = nms_World_getBlockMetadata($par2, $par3, $par4, $par5);
+    nms_Block_$callClinit();
+    if (!nms_Block_blocksList.data[$var6].$isPowered)
+        $this.$isStraightRail = 0;
+    else {
+        $this.$isStraightRail = 1;
+        $var7 = $var7 & (-9);
+    }
+    $java.nms_BlockBaseRailLogic_setBasicRail($this, $var7);
+};
+$java.nms_BlockBaseRailLogic_setBasicRail = function($this, $par1) {
+    var var$2, var$3, var$4, var$5;
+    a: {
+        var$2 = $this.$railChunkPosition;
+        ju_Arrays_fill(var$2.$array1, 0, var$2.$size0, null);
+        var$2.$size0 = 0;
+        if (!$par1) {
+            var$2 = $this.$railChunkPosition;
+            var$3 = new nms_ChunkPosition;
+            $par1 = $this.$railX;
+            var$4 = $this.$railY;
+            var$5 = $this.$railZ - 1 | 0;
+            var$3.$x4 = $par1;
+            var$3.$y3 = var$4;
+            var$3.$z5 = var$5;
+            ju_ArrayList_add(var$2, var$3);
+            var$2 = $this.$railChunkPosition;
+            var$3 = new nms_ChunkPosition;
+            $par1 = $this.$railX;
+            var$4 = $this.$railY;
+            var$5 = $this.$railZ + 1 | 0;
+            var$3.$x4 = $par1;
+            var$3.$y3 = var$4;
+            var$3.$z5 = var$5;
+            ju_ArrayList_add(var$2, var$3);
+            break a;
+        }
+        if ($par1 == 1) {
+            var$2 = $this.$railChunkPosition;
+            var$3 = new nms_ChunkPosition;
+            $par1 = $this.$railX - 1 | 0;
+            var$4 = $this.$railY;
+            var$5 = $this.$railZ;
+            var$3.$x4 = $par1;
+            var$3.$y3 = var$4;
+            var$3.$z5 = var$5;
+            ju_ArrayList_add(var$2, var$3);
+            var$2 = $this.$railChunkPosition;
+            var$3 = new nms_ChunkPosition;
+            $par1 = $this.$railX + 1 | 0;
+            var$4 = $this.$railY;
+            var$5 = $this.$railZ;
+            var$3.$x4 = $par1;
+            var$3.$y3 = var$4;
+            var$3.$z5 = var$5;
+            ju_ArrayList_add(var$2, var$3);
+            break a;
+        }
+        if ($par1 == 2) {
+            var$2 = $this.$railChunkPosition;
+            var$3 = new nms_ChunkPosition;
+            $par1 = $this.$railX - 1 | 0;
+            var$4 = $this.$railY;
+            var$5 = $this.$railZ;
+            var$3.$x4 = $par1;
+            var$3.$y3 = var$4;
+            var$3.$z5 = var$5;
+            ju_ArrayList_add(var$2, var$3);
+            var$2 = $this.$railChunkPosition;
+            var$3 = new nms_ChunkPosition;
+            var$5 = $this.$railX + 1 | 0;
+            $par1 = $this.$railY + 1 | 0;
+            var$4 = $this.$railZ;
+            var$3.$x4 = var$5;
+            var$3.$y3 = $par1;
+            var$3.$z5 = var$4;
+            ju_ArrayList_add(var$2, var$3);
+            break a;
+        }
+        if ($par1 == 3) {
+            var$2 = $this.$railChunkPosition;
+            var$3 = new nms_ChunkPosition;
+            $par1 = $this.$railX - 1 | 0;
+            var$4 = $this.$railY + 1 | 0;
+            var$5 = $this.$railZ;
+            var$3.$x4 = $par1;
+            var$3.$y3 = var$4;
+            var$3.$z5 = var$5;
+            ju_ArrayList_add(var$2, var$3);
+            var$2 = $this.$railChunkPosition;
+            var$3 = new nms_ChunkPosition;
+            $par1 = $this.$railX + 1 | 0;
+            var$4 = $this.$railY;
+            var$5 = $this.$railZ;
+            var$3.$x4 = $par1;
+            var$3.$y3 = var$4;
+            var$3.$z5 = var$5;
+            ju_ArrayList_add(var$2, var$3);
+            break a;
+        }
+        if ($par1 == 4) {
+            var$2 = $this.$railChunkPosition;
+            var$3 = new nms_ChunkPosition;
+            $par1 = $this.$railX;
+            var$4 = $this.$railY + 1 | 0;
+            var$5 = $this.$railZ - 1 | 0;
+            var$3.$x4 = $par1;
+            var$3.$y3 = var$4;
+            var$3.$z5 = var$5;
+            ju_ArrayList_add(var$2, var$3);
+            var$2 = $this.$railChunkPosition;
+            var$3 = new nms_ChunkPosition;
+            $par1 = $this.$railX;
+            var$4 = $this.$railY;
+            var$5 = $this.$railZ + 1 | 0;
+            var$3.$x4 = $par1;
+            var$3.$y3 = var$4;
+            var$3.$z5 = var$5;
+            ju_ArrayList_add(var$2, var$3);
+            break a;
+        }
+        if ($par1 == 5) {
+            var$2 = $this.$railChunkPosition;
+            var$3 = new nms_ChunkPosition;
+            $par1 = $this.$railX;
+            var$4 = $this.$railY;
+            var$5 = $this.$railZ - 1 | 0;
+            var$3.$x4 = $par1;
+            var$3.$y3 = var$4;
+            var$3.$z5 = var$5;
+            ju_ArrayList_add(var$2, var$3);
+            var$2 = $this.$railChunkPosition;
+            var$3 = new nms_ChunkPosition;
+            $par1 = $this.$railX;
+            var$4 = $this.$railY + 1 | 0;
+            var$5 = $this.$railZ + 1 | 0;
+            var$3.$x4 = $par1;
+            var$3.$y3 = var$4;
+            var$3.$z5 = var$5;
+            ju_ArrayList_add(var$2, var$3);
+            break a;
+        }
+        if ($par1 == 6) {
+            var$2 = $this.$railChunkPosition;
+            var$3 = new nms_ChunkPosition;
+            $par1 = $this.$railX + 1 | 0;
+            var$4 = $this.$railY;
+            var$5 = $this.$railZ;
+            var$3.$x4 = $par1;
+            var$3.$y3 = var$4;
+            var$3.$z5 = var$5;
+            ju_ArrayList_add(var$2, var$3);
+            ju_ArrayList_add($this.$railChunkPosition, $java.nms_ChunkPosition__init_($this.$railX, $this.$railY, $this.$railZ + 1 | 0));
+            break a;
+        }
+        if ($par1 == 7) {
+            ju_ArrayList_add($this.$railChunkPosition, $java.nms_ChunkPosition__init_($this.$railX - 1 | 0, $this.$railY, $this.$railZ));
+            ju_ArrayList_add($this.$railChunkPosition, $java.nms_ChunkPosition__init_($this.$railX, $this.$railY, $this.$railZ + 1 | 0));
+            break a;
+        }
+        if ($par1 == 8) {
+            ju_ArrayList_add($this.$railChunkPosition, $java.nms_ChunkPosition__init_($this.$railX - 1 | 0, $this.$railY, $this.$railZ));
+            ju_ArrayList_add($this.$railChunkPosition, $java.nms_ChunkPosition__init_($this.$railX, $this.$railY, $this.$railZ - 1 | 0));
+            break a;
+        }
+        if ($par1 != 9)
+            break a;
+        ju_ArrayList_add($this.$railChunkPosition, $java.nms_ChunkPosition__init_($this.$railX + 1 | 0, $this.$railY, $this.$railZ));
+        ju_ArrayList_add($this.$railChunkPosition, $java.nms_ChunkPosition__init_($this.$railX, $this.$railY, $this.$railZ - 1 | 0));
+    }
+};
+$java.nms_BlockBaseRailLogic_refreshConnectedTracks = function($this) {
+    var $var1, $var2, var$3, var$4, var$5, var$6, var$7;
+    $var1 = 0;
+    a: {
+        b: {
+            while ($var1 < $this.$railChunkPosition.$size0) {
+                $var2 = $this.$railChunkPosition;
+                if ($var1 < 0)
+                    break a;
+                if ($var1 >= $var2.$size0)
+                    break a;
+                $var2 = $java.nms_BlockBaseRailLogic_getRailLogic($this, $var2.$array1.data[$var1]);
+                if ($var2 !== null && $java.nms_BlockBaseRailLogic_isRailChunkPositionCorrect($var2, $this)) {
+                    var$3 = $this.$railChunkPosition;
+                    var$4 = new nms_ChunkPosition;
+                    var$5 = $var2.$railX;
+                    var$6 = $var2.$railY;
+                    var$7 = $var2.$railZ;
+                    var$4.$x4 = var$5;
+                    var$4.$y3 = var$6;
+                    var$4.$z5 = var$7;
+                    if ($var1 < 0)
+                        break b;
+                    if ($var1 >= var$3.$size0)
+                        break b;
+                    var$3.$array1.data[$var1] = var$4;
+                    var$5 = $var1;
+                } else {
+                    $var2 = $this.$railChunkPosition;
+                    var$5 = $var1 + (-1) | 0;
+                    ju_ArrayList_remove($var2, $var1);
+                }
+                $var1 = var$5 + 1 | 0;
+            }
+            return;
+        }
+        $var2 = new jl_IndexOutOfBoundsException;
+        $var2.$suppressionEnabled = 1;
+        $var2.$writableStackTrace = 1;
+        $rt_throw($var2);
+    }
+    $var2 = new jl_IndexOutOfBoundsException;
+    $var2.$suppressionEnabled = 1;
+    $var2.$writableStackTrace = 1;
+    $rt_throw($var2);
+};
+$java.nms_BlockBaseRailLogic_isMinecartTrack = function($this, $par1, $par2, $par3) {
+    return nms_BlockRailBase_isRailBlock(nms_World_getBlockId($this.$logicWorld, $par1, $par2, $par3)) ? 1 : nms_BlockRailBase_isRailBlock(nms_World_getBlockId($this.$logicWorld, $par1, $par2 + 1 | 0, $par3)) ? 1 : nms_BlockRailBase_isRailBlock(nms_World_getBlockId($this.$logicWorld, $par1, $par2 - 1 | 0, $par3));
+};
+$java.nms_BlockBaseRailLogic_getRailLogic = function($this, $par1ChunkPosition) {
+    return nms_BlockRailBase_isRailBlock(nms_World_getBlockId($this.$logicWorld, $par1ChunkPosition.$x4, $par1ChunkPosition.$y3, $par1ChunkPosition.$z5)) ? nms_BlockBaseRailLogic__init_($this.$theRail, $this.$logicWorld, $par1ChunkPosition.$x4, $par1ChunkPosition.$y3, $par1ChunkPosition.$z5) : nms_BlockRailBase_isRailBlock(nms_World_getBlockId($this.$logicWorld, $par1ChunkPosition.$x4, $par1ChunkPosition.$y3 + 1 | 0, $par1ChunkPosition.$z5)) ? nms_BlockBaseRailLogic__init_($this.$theRail, $this.$logicWorld,
+    $par1ChunkPosition.$x4, $par1ChunkPosition.$y3 + 1 | 0, $par1ChunkPosition.$z5) : !nms_BlockRailBase_isRailBlock(nms_World_getBlockId($this.$logicWorld, $par1ChunkPosition.$x4, $par1ChunkPosition.$y3 - 1 | 0, $par1ChunkPosition.$z5)) ? null : nms_BlockBaseRailLogic__init_($this.$theRail, $this.$logicWorld, $par1ChunkPosition.$x4, $par1ChunkPosition.$y3 - 1 | 0, $par1ChunkPosition.$z5);
+};
+$java.nms_BlockBaseRailLogic_isRailChunkPositionCorrect = function($this, $par1BlockBaseRailLogic) {
+    var $var2, $var3;
+    $var2 = 0;
+    a: {
+        while ($var2 < $this.$railChunkPosition.$size0) {
+            $var3 = $this.$railChunkPosition;
+            if ($var2 < 0)
+                break a;
+            if ($var2 >= $var3.$size0)
+                break a;
+            $var3 = $var3.$array1.data[$var2];
+            if ($var3.$x4 == $par1BlockBaseRailLogic.$railX && $var3.$z5 == $par1BlockBaseRailLogic.$railZ)
+                return 1;
+            $var2 = $var2 + 1 | 0;
+        }
+        return 0;
+    }
+    $par1BlockBaseRailLogic = new jl_IndexOutOfBoundsException;
+    $par1BlockBaseRailLogic.$suppressionEnabled = 1;
+    $par1BlockBaseRailLogic.$writableStackTrace = 1;
+    $rt_throw($par1BlockBaseRailLogic);
+};
+$java.nms_BlockBaseRailLogic_isPartOfTrack = function($this, $par1, $par2, $par3) {
+    var $var4, $var5;
+    $var4 = 0;
+    a: {
+        while ($var4 < $this.$railChunkPosition.$size0) {
+            $var5 = $this.$railChunkPosition;
+            if ($var4 < 0)
+                break a;
+            if ($var4 >= $var5.$size0)
+                break a;
+            $var5 = $var5.$array1.data[$var4];
+            if ($var5.$x4 == $par1 && $var5.$z5 == $par3)
+                return 1;
+            $var4 = $var4 + 1 | 0;
+        }
+        return 0;
+    }
+    $var5 = new jl_IndexOutOfBoundsException;
+    $var5.$suppressionEnabled = 1;
+    $var5.$writableStackTrace = 1;
+    $rt_throw($var5);
+};
+function nms_BlockBaseRailLogic_getNumberOfAdjacentTracks($this) {
+    var $var1;
+    $var1 = 0;
+    if ($java.nms_BlockBaseRailLogic_isMinecartTrack($this, $this.$railX, $this.$railY, $this.$railZ - 1 | 0))
+        $var1 = 1;
+    if ($java.nms_BlockBaseRailLogic_isMinecartTrack($this, $this.$railX, $this.$railY, $this.$railZ + 1 | 0))
+        $var1 = $var1 + 1 | 0;
+    if ($java.nms_BlockBaseRailLogic_isMinecartTrack($this, $this.$railX - 1 | 0, $this.$railY, $this.$railZ))
+        $var1 = $var1 + 1 | 0;
+    if ($java.nms_BlockBaseRailLogic_isMinecartTrack($this, $this.$railX + 1 | 0, $this.$railY, $this.$railZ))
+        $var1 = $var1 + 1 | 0;
+    return $var1;
+}
+$java.nms_BlockBaseRailLogic_canConnectTo = function($this, $par1BlockBaseRailLogic) {
+    return $java.nms_BlockBaseRailLogic_isRailChunkPositionCorrect($this, $par1BlockBaseRailLogic) ? 1 : $this.$railChunkPosition.$size0 == 2 ? 0 : !($this.$railChunkPosition.$size0 ? 0 : 1) ? 1 : 1;
+};
+$java.nms_BlockBaseRailLogic_connectToNeighbor = function($this, $par1BlockBaseRailLogic) {
+    var var$2, var$3, $var2, $var3, $var4, $var5, $var6, $ptr, $tmp;
+    $ptr = 0;
+    if ($rt_resuming()) {
+        var $thread = $rt_nativeThread();
+        $ptr = $thread.pop();$var6 = $thread.pop();$var5 = $thread.pop();$var4 = $thread.pop();$var3 = $thread.pop();$var2 = $thread.pop();var$3 = $thread.pop();var$2 = $thread.pop();$par1BlockBaseRailLogic = $thread.pop();$this = $thread.pop();
+    }
+    main: while (true) { switch ($ptr) {
+    case 0:
+        var$2 = $this.$railChunkPosition;
+        var$3 = new nms_ChunkPosition;
+        $var2 = $par1BlockBaseRailLogic.$railX;
+        $var3 = $par1BlockBaseRailLogic.$railY;
+        $var4 = $par1BlockBaseRailLogic.$railZ;
+        var$3.$x4 = $var2;
+        var$3.$y3 = $var3;
+        var$3.$z5 = $var4;
+        ju_ArrayList_add(var$2, var$3);
+        $var2 = $java.nms_BlockBaseRailLogic_isPartOfTrack($this, $this.$railX, $this.$railY, $this.$railZ - 1 | 0);
+        $var3 = $java.nms_BlockBaseRailLogic_isPartOfTrack($this, $this.$railX, $this.$railY, $this.$railZ + 1 | 0);
+        $var4 = $java.nms_BlockBaseRailLogic_isPartOfTrack($this, $this.$railX - 1 | 0, $this.$railY, $this.$railZ);
+        $var5 = $java.nms_BlockBaseRailLogic_isPartOfTrack($this, $this.$railX + 1 | 0, $this.$railY, $this.$railZ);
+        $var6 = (-1);
+        if (!(!$var2 && !$var3))
+            $var6 = 0;
+        if (!(!$var4 && !$var5))
+            $var6 = 1;
+        if (!$this.$isStraightRail) {
+            if ($var3 && $var5 && !$var2 && !$var4)
+                $var6 = 6;
+            if ($var3 && $var4 && !$var2 && !$var5)
+                $var6 = 7;
+            if ($var2 && $var4 && !$var3 && !$var5)
+                $var6 = 8;
+            if ($var2 && $var5 && !$var3 && !$var4)
+                $var6 = 9;
+        }
+        if (!$var6) {
+            if (nms_BlockRailBase_isRailBlock(nms_World_getBlockId($this.$logicWorld, $this.$railX, $this.$railY + 1 | 0, $this.$railZ - 1 | 0)))
+                $var6 = 4;
+            if (nms_BlockRailBase_isRailBlock(nms_World_getBlockId($this.$logicWorld, $this.$railX, $this.$railY + 1 | 0, $this.$railZ + 1 | 0)))
+                $var6 = 5;
+        }
+        if ($var6 == 1) {
+            if (nms_BlockRailBase_isRailBlock(nms_World_getBlockId($this.$logicWorld, $this.$railX + 1 | 0, $this.$railY + 1 | 0, $this.$railZ)))
+                $var6 = 2;
+            if (nms_BlockRailBase_isRailBlock(nms_World_getBlockId($this.$logicWorld, $this.$railX - 1 | 0, $this.$railY + 1 | 0, $this.$railZ)))
+                $var6 = 3;
+        }
+        if ($var6 < 0)
+            $var6 = 0;
+        if ($this.$isStraightRail)
+            $var6 = nms_World_getBlockMetadata($this.$logicWorld, $this.$railX, $this.$railY, $this.$railZ) & 8 | $var6;
+        $par1BlockBaseRailLogic = $this.$logicWorld;
+        $var3 = $this.$railX;
+        $var4 = $this.$railY;
+        $var5 = $this.$railZ;
+        $var2 = 3;
+        $ptr = 1;
+    case 1:
+        nms_World_setBlockMetadataWithNotify($par1BlockBaseRailLogic, $var3, $var4, $var5, $var6, $var2);
+        if ($rt_suspending()) {
+            break main;
+        }
+        return;
+    default: $rt_invalidPointer();
+    }}
+    $rt_nativeThread().push($this, $par1BlockBaseRailLogic, var$2, var$3, $var2, $var3, $var4, $var5, $var6, $ptr);
+};
+$java.nms_BlockBaseRailLogic_canConnectFrom = function($this, $par1, $par2, $par3) {
+    var $var4;
+    $var4 = new nms_ChunkPosition;
+    $var4.$x4 = $par1;
+    $var4.$y3 = $par2;
+    $var4.$z5 = $par3;
+    $var4 = $java.nms_BlockBaseRailLogic_getRailLogic($this, $var4);
+    if ($var4 === null)
+        return 0;
+    $java.nms_BlockBaseRailLogic_refreshConnectedTracks($var4);
+    return $java.nms_BlockBaseRailLogic_canConnectTo($var4, $this);
+};
+function nms_BlockBaseRailLogic_func_94511_a($this, $par1, $par2) {
+    var $var3, $var4, $var5, $var6, $var7, $var10, $var9, $ptr, $tmp;
+    $ptr = 0;
+    if ($rt_resuming()) {
+        var $thread = $rt_nativeThread();
+        $ptr = $thread.pop();$var9 = $thread.pop();$var10 = $thread.pop();$var7 = $thread.pop();$var6 = $thread.pop();$var5 = $thread.pop();$var4 = $thread.pop();$var3 = $thread.pop();$par2 = $thread.pop();$par1 = $thread.pop();$this = $thread.pop();
+    }
+    main: while (true) { switch ($ptr) {
+    case 0:
+        $var3 = $java.nms_BlockBaseRailLogic_canConnectFrom($this, $this.$railX, $this.$railY, $this.$railZ - 1 | 0);
+        $var4 = $java.nms_BlockBaseRailLogic_canConnectFrom($this, $this.$railX, $this.$railY, $this.$railZ + 1 | 0);
+        $var5 = $java.nms_BlockBaseRailLogic_canConnectFrom($this, $this.$railX - 1 | 0, $this.$railY, $this.$railZ);
+        $var6 = $java.nms_BlockBaseRailLogic_canConnectFrom($this, $this.$railX + 1 | 0, $this.$railY, $this.$railZ);
+        $var7 = (-1);
+        if (!(!$var3 && !$var4) && !$var5 && !$var6)
+            $var7 = 0;
+        if (!(!$var5 && !$var6) && !$var3 && !$var4)
+            $var7 = 1;
+        if (!$this.$isStraightRail) {
+            if ($var4 && $var6 && !$var3 && !$var5)
+                $var7 = 6;
+            if ($var4 && $var5 && !$var3 && !$var6)
+                $var7 = 7;
+            if ($var3 && $var5 && !$var4 && !$var6)
+                $var7 = 8;
+            if ($var3 && $var6 && !$var4 && !$var5)
+                $var7 = 9;
+        }
+        if ($var7 == (-1)) {
+            if (!(!$var3 && !$var4))
+                $var7 = 0;
+            if (!(!$var5 && !$var6))
+                $var7 = 1;
+            if (!$this.$isStraightRail) {
+                if (!$par1) {
+                    if ($var3 && $var5)
+                        $var7 = 8;
+                    if ($var6 && $var3)
+                        $var7 = 9;
+                    if ($var5 && $var4)
+                        $var7 = 7;
+                    if ($var4 && $var6)
+                        $var7 = 6;
+                } else {
+                    if ($var4 && $var6)
+                        $var7 = 6;
+                    if ($var5 && $var4)
+                        $var7 = 7;
+                    if ($var6 && $var3)
+                        $var7 = 9;
+                    if ($var3 && $var5)
+                        $var7 = 8;
+                }
+            }
+        }
+        if (!$var7) {
+            if (nms_BlockRailBase_isRailBlockAt($this.$logicWorld, $this.$railX, $this.$railY + 1 | 0, $this.$railZ - 1 | 0))
+                $var7 = 4;
+            if (nms_BlockRailBase_isRailBlockAt($this.$logicWorld, $this.$railX, $this.$railY + 1 | 0, $this.$railZ + 1 | 0))
+                $var7 = 5;
+        }
+        if ($var7 == 1) {
+            if (nms_BlockRailBase_isRailBlockAt($this.$logicWorld, $this.$railX + 1 | 0, $this.$railY + 1 | 0, $this.$railZ))
+                $var7 = 2;
+            if (nms_BlockRailBase_isRailBlockAt($this.$logicWorld, $this.$railX - 1 | 0, $this.$railY + 1 | 0, $this.$railZ))
+                $var7 = 3;
+        }
+        if ($var7 < 0)
+            $var7 = 0;
+        $java.nms_BlockBaseRailLogic_setBasicRail($this, $var7);
+        if ($this.$isStraightRail)
+            $var7 = nms_World_getBlockMetadata($this.$logicWorld, $this.$railX, $this.$railY, $this.$railZ) & 8 | $var7;
+        if (!$par2 && nms_World_getBlockMetadata($this.$logicWorld, $this.$railX, $this.$railY, $this.$railZ) == $var7)
+            return;
+        $var10 = $this.$logicWorld;
+        $par2 = $this.$railX;
+        $var9 = $this.$railY;
+        $var3 = $this.$railZ;
+        $par1 = 3;
+        $ptr = 1;
+    case 1:
+        nms_World_setBlockMetadataWithNotify($var10, $par2, $var9, $var3, $var7, $par1);
+        if ($rt_suspending()) {
+            break main;
+        }
+        $var9 = 0;
+        while ($var9 < ju_ArrayList_size($this.$railChunkPosition)) {
+            $var10 = $java.nms_BlockBaseRailLogic_getRailLogic($this, ju_ArrayList_get($this.$railChunkPosition, $var9));
+            if ($var10 !== null) {
+                $java.nms_BlockBaseRailLogic_refreshConnectedTracks($var10);
+                if ($java.nms_BlockBaseRailLogic_canConnectTo($var10, $this)) {
+                    $ptr = 2;
+                    continue main;
+                }
+            }
+            $var9 = $var9 + 1 | 0;
+        }
+        return;
+    case 2:
+        $java.nms_BlockBaseRailLogic_connectToNeighbor($var10, $this);
+        if ($rt_suspending()) {
+            break main;
+        }
+        while (true) {
+            $var9 = $var9 + 1 | 0;
+            if ($var9 >= ju_ArrayList_size($this.$railChunkPosition))
+                break;
+            $var10 = $java.nms_BlockBaseRailLogic_getRailLogic($this, ju_ArrayList_get($this.$railChunkPosition, $var9));
+            if ($var10 === null)
+                continue;
+            $java.nms_BlockBaseRailLogic_refreshConnectedTracks($var10);
+            if (!$java.nms_BlockBaseRailLogic_canConnectTo($var10, $this))
+                continue;
+            else {
+                continue main;
+            }
+        }
+        return;
+    default: $rt_invalidPointer();
+    }}
+    $rt_nativeThread().push($this, $par1, $par2, $var3, $var4, $var5, $var6, $var7, $var10, $var9, $ptr);
+}
 function nms_InventoryLargeChest() {
     var a = this; jl_Object.call(a);
     a.$name10 = null;
@@ -220947,519 +221477,6 @@ $java.nms_GuiCommandBlock_drawScreen = function($this, $par1, $par2, $par3) {
     var$6.$writableStackTrace = 1;
     $rt_throw(var$6);
 };
-function nms_BlockBaseRailLogic() {
-    var a = this; jl_Object.call(a);
-    a.$logicWorld = null;
-    a.$railX = 0;
-    a.$railY = 0;
-    a.$railZ = 0;
-    a.$isStraightRail = 0;
-    a.$railChunkPosition = null;
-    a.$theRail = null;
-}
-function nms_BlockBaseRailLogic__init_(var_0, var_1, var_2, var_3, var_4) {
-    var var_5 = new nms_BlockBaseRailLogic();
-    $java.nms_BlockBaseRailLogic__init_(var_5, var_0, var_1, var_2, var_3, var_4);
-    return var_5;
-}
-$java.nms_BlockBaseRailLogic__init_ = function($this, $par1, $par2, $par3, $par4, $par5) {
-    var $var6, $var7;
-    $this.$theRail = $par1;
-    $par1 = new ju_ArrayList;
-    $par1.$array1 = $rt_createArray(jl_Object, 10);
-    $this.$railChunkPosition = $par1;
-    $this.$logicWorld = $par2;
-    $this.$railX = $par3;
-    $this.$railY = $par4;
-    $this.$railZ = $par5;
-    $var6 = nms_World_getBlockId($par2, $par3, $par4, $par5);
-    $var7 = nms_World_getBlockMetadata($par2, $par3, $par4, $par5);
-    nms_Block_$callClinit();
-    if (!nms_Block_blocksList.data[$var6].$isPowered)
-        $this.$isStraightRail = 0;
-    else {
-        $this.$isStraightRail = 1;
-        $var7 = $var7 & (-9);
-    }
-    $java.nms_BlockBaseRailLogic_setBasicRail($this, $var7);
-};
-$java.nms_BlockBaseRailLogic_setBasicRail = function($this, $par1) {
-    var var$2, var$3, var$4, var$5;
-    a: {
-        var$2 = $this.$railChunkPosition;
-        ju_Arrays_fill(var$2.$array1, 0, var$2.$size0, null);
-        var$2.$size0 = 0;
-        if (!$par1) {
-            var$2 = $this.$railChunkPosition;
-            var$3 = new nms_ChunkPosition;
-            $par1 = $this.$railX;
-            var$4 = $this.$railY;
-            var$5 = $this.$railZ - 1 | 0;
-            var$3.$x4 = $par1;
-            var$3.$y3 = var$4;
-            var$3.$z5 = var$5;
-            ju_ArrayList_add(var$2, var$3);
-            var$2 = $this.$railChunkPosition;
-            var$3 = new nms_ChunkPosition;
-            $par1 = $this.$railX;
-            var$4 = $this.$railY;
-            var$5 = $this.$railZ + 1 | 0;
-            var$3.$x4 = $par1;
-            var$3.$y3 = var$4;
-            var$3.$z5 = var$5;
-            ju_ArrayList_add(var$2, var$3);
-            break a;
-        }
-        if ($par1 == 1) {
-            var$2 = $this.$railChunkPosition;
-            var$3 = new nms_ChunkPosition;
-            $par1 = $this.$railX - 1 | 0;
-            var$4 = $this.$railY;
-            var$5 = $this.$railZ;
-            var$3.$x4 = $par1;
-            var$3.$y3 = var$4;
-            var$3.$z5 = var$5;
-            ju_ArrayList_add(var$2, var$3);
-            var$2 = $this.$railChunkPosition;
-            var$3 = new nms_ChunkPosition;
-            $par1 = $this.$railX + 1 | 0;
-            var$4 = $this.$railY;
-            var$5 = $this.$railZ;
-            var$3.$x4 = $par1;
-            var$3.$y3 = var$4;
-            var$3.$z5 = var$5;
-            ju_ArrayList_add(var$2, var$3);
-            break a;
-        }
-        if ($par1 == 2) {
-            var$2 = $this.$railChunkPosition;
-            var$3 = new nms_ChunkPosition;
-            $par1 = $this.$railX - 1 | 0;
-            var$4 = $this.$railY;
-            var$5 = $this.$railZ;
-            var$3.$x4 = $par1;
-            var$3.$y3 = var$4;
-            var$3.$z5 = var$5;
-            ju_ArrayList_add(var$2, var$3);
-            var$2 = $this.$railChunkPosition;
-            var$3 = new nms_ChunkPosition;
-            var$5 = $this.$railX + 1 | 0;
-            $par1 = $this.$railY + 1 | 0;
-            var$4 = $this.$railZ;
-            var$3.$x4 = var$5;
-            var$3.$y3 = $par1;
-            var$3.$z5 = var$4;
-            ju_ArrayList_add(var$2, var$3);
-            break a;
-        }
-        if ($par1 == 3) {
-            var$2 = $this.$railChunkPosition;
-            var$3 = new nms_ChunkPosition;
-            $par1 = $this.$railX - 1 | 0;
-            var$4 = $this.$railY + 1 | 0;
-            var$5 = $this.$railZ;
-            var$3.$x4 = $par1;
-            var$3.$y3 = var$4;
-            var$3.$z5 = var$5;
-            ju_ArrayList_add(var$2, var$3);
-            var$2 = $this.$railChunkPosition;
-            var$3 = new nms_ChunkPosition;
-            $par1 = $this.$railX + 1 | 0;
-            var$4 = $this.$railY;
-            var$5 = $this.$railZ;
-            var$3.$x4 = $par1;
-            var$3.$y3 = var$4;
-            var$3.$z5 = var$5;
-            ju_ArrayList_add(var$2, var$3);
-            break a;
-        }
-        if ($par1 == 4) {
-            var$2 = $this.$railChunkPosition;
-            var$3 = new nms_ChunkPosition;
-            $par1 = $this.$railX;
-            var$4 = $this.$railY + 1 | 0;
-            var$5 = $this.$railZ - 1 | 0;
-            var$3.$x4 = $par1;
-            var$3.$y3 = var$4;
-            var$3.$z5 = var$5;
-            ju_ArrayList_add(var$2, var$3);
-            var$2 = $this.$railChunkPosition;
-            var$3 = new nms_ChunkPosition;
-            $par1 = $this.$railX;
-            var$4 = $this.$railY;
-            var$5 = $this.$railZ + 1 | 0;
-            var$3.$x4 = $par1;
-            var$3.$y3 = var$4;
-            var$3.$z5 = var$5;
-            ju_ArrayList_add(var$2, var$3);
-            break a;
-        }
-        if ($par1 == 5) {
-            var$2 = $this.$railChunkPosition;
-            var$3 = new nms_ChunkPosition;
-            $par1 = $this.$railX;
-            var$4 = $this.$railY;
-            var$5 = $this.$railZ - 1 | 0;
-            var$3.$x4 = $par1;
-            var$3.$y3 = var$4;
-            var$3.$z5 = var$5;
-            ju_ArrayList_add(var$2, var$3);
-            var$2 = $this.$railChunkPosition;
-            var$3 = new nms_ChunkPosition;
-            $par1 = $this.$railX;
-            var$4 = $this.$railY + 1 | 0;
-            var$5 = $this.$railZ + 1 | 0;
-            var$3.$x4 = $par1;
-            var$3.$y3 = var$4;
-            var$3.$z5 = var$5;
-            ju_ArrayList_add(var$2, var$3);
-            break a;
-        }
-        if ($par1 == 6) {
-            var$2 = $this.$railChunkPosition;
-            var$3 = new nms_ChunkPosition;
-            $par1 = $this.$railX + 1 | 0;
-            var$4 = $this.$railY;
-            var$5 = $this.$railZ;
-            var$3.$x4 = $par1;
-            var$3.$y3 = var$4;
-            var$3.$z5 = var$5;
-            ju_ArrayList_add(var$2, var$3);
-            ju_ArrayList_add($this.$railChunkPosition, $java.nms_ChunkPosition__init_($this.$railX, $this.$railY, $this.$railZ + 1 | 0));
-            break a;
-        }
-        if ($par1 == 7) {
-            ju_ArrayList_add($this.$railChunkPosition, $java.nms_ChunkPosition__init_($this.$railX - 1 | 0, $this.$railY, $this.$railZ));
-            ju_ArrayList_add($this.$railChunkPosition, $java.nms_ChunkPosition__init_($this.$railX, $this.$railY, $this.$railZ + 1 | 0));
-            break a;
-        }
-        if ($par1 == 8) {
-            ju_ArrayList_add($this.$railChunkPosition, $java.nms_ChunkPosition__init_($this.$railX - 1 | 0, $this.$railY, $this.$railZ));
-            ju_ArrayList_add($this.$railChunkPosition, $java.nms_ChunkPosition__init_($this.$railX, $this.$railY, $this.$railZ - 1 | 0));
-            break a;
-        }
-        if ($par1 != 9)
-            break a;
-        ju_ArrayList_add($this.$railChunkPosition, $java.nms_ChunkPosition__init_($this.$railX + 1 | 0, $this.$railY, $this.$railZ));
-        ju_ArrayList_add($this.$railChunkPosition, $java.nms_ChunkPosition__init_($this.$railX, $this.$railY, $this.$railZ - 1 | 0));
-    }
-};
-$java.nms_BlockBaseRailLogic_refreshConnectedTracks = function($this) {
-    var $var1, $var2, var$3, var$4, var$5, var$6, var$7;
-    $var1 = 0;
-    a: {
-        b: {
-            while ($var1 < $this.$railChunkPosition.$size0) {
-                $var2 = $this.$railChunkPosition;
-                if ($var1 < 0)
-                    break a;
-                if ($var1 >= $var2.$size0)
-                    break a;
-                $var2 = $java.nms_BlockBaseRailLogic_getRailLogic($this, $var2.$array1.data[$var1]);
-                if ($var2 !== null && $java.nms_BlockBaseRailLogic_isRailChunkPositionCorrect($var2, $this)) {
-                    var$3 = $this.$railChunkPosition;
-                    var$4 = new nms_ChunkPosition;
-                    var$5 = $var2.$railX;
-                    var$6 = $var2.$railY;
-                    var$7 = $var2.$railZ;
-                    var$4.$x4 = var$5;
-                    var$4.$y3 = var$6;
-                    var$4.$z5 = var$7;
-                    if ($var1 < 0)
-                        break b;
-                    if ($var1 >= var$3.$size0)
-                        break b;
-                    var$3.$array1.data[$var1] = var$4;
-                    var$5 = $var1;
-                } else {
-                    $var2 = $this.$railChunkPosition;
-                    var$5 = $var1 + (-1) | 0;
-                    ju_ArrayList_remove($var2, $var1);
-                }
-                $var1 = var$5 + 1 | 0;
-            }
-            return;
-        }
-        $var2 = new jl_IndexOutOfBoundsException;
-        $var2.$suppressionEnabled = 1;
-        $var2.$writableStackTrace = 1;
-        $rt_throw($var2);
-    }
-    $var2 = new jl_IndexOutOfBoundsException;
-    $var2.$suppressionEnabled = 1;
-    $var2.$writableStackTrace = 1;
-    $rt_throw($var2);
-};
-$java.nms_BlockBaseRailLogic_isMinecartTrack = function($this, $par1, $par2, $par3) {
-    return nms_BlockRailBase_isRailBlock(nms_World_getBlockId($this.$logicWorld, $par1, $par2, $par3)) ? 1 : nms_BlockRailBase_isRailBlock(nms_World_getBlockId($this.$logicWorld, $par1, $par2 + 1 | 0, $par3)) ? 1 : nms_BlockRailBase_isRailBlock(nms_World_getBlockId($this.$logicWorld, $par1, $par2 - 1 | 0, $par3));
-};
-$java.nms_BlockBaseRailLogic_getRailLogic = function($this, $par1ChunkPosition) {
-    return nms_BlockRailBase_isRailBlock(nms_World_getBlockId($this.$logicWorld, $par1ChunkPosition.$x4, $par1ChunkPosition.$y3, $par1ChunkPosition.$z5)) ? nms_BlockBaseRailLogic__init_($this.$theRail, $this.$logicWorld, $par1ChunkPosition.$x4, $par1ChunkPosition.$y3, $par1ChunkPosition.$z5) : nms_BlockRailBase_isRailBlock(nms_World_getBlockId($this.$logicWorld, $par1ChunkPosition.$x4, $par1ChunkPosition.$y3 + 1 | 0, $par1ChunkPosition.$z5)) ? nms_BlockBaseRailLogic__init_($this.$theRail, $this.$logicWorld,
-    $par1ChunkPosition.$x4, $par1ChunkPosition.$y3 + 1 | 0, $par1ChunkPosition.$z5) : !nms_BlockRailBase_isRailBlock(nms_World_getBlockId($this.$logicWorld, $par1ChunkPosition.$x4, $par1ChunkPosition.$y3 - 1 | 0, $par1ChunkPosition.$z5)) ? null : nms_BlockBaseRailLogic__init_($this.$theRail, $this.$logicWorld, $par1ChunkPosition.$x4, $par1ChunkPosition.$y3 - 1 | 0, $par1ChunkPosition.$z5);
-};
-$java.nms_BlockBaseRailLogic_isRailChunkPositionCorrect = function($this, $par1BlockBaseRailLogic) {
-    var $var2, $var3;
-    $var2 = 0;
-    a: {
-        while ($var2 < $this.$railChunkPosition.$size0) {
-            $var3 = $this.$railChunkPosition;
-            if ($var2 < 0)
-                break a;
-            if ($var2 >= $var3.$size0)
-                break a;
-            $var3 = $var3.$array1.data[$var2];
-            if ($var3.$x4 == $par1BlockBaseRailLogic.$railX && $var3.$z5 == $par1BlockBaseRailLogic.$railZ)
-                return 1;
-            $var2 = $var2 + 1 | 0;
-        }
-        return 0;
-    }
-    $par1BlockBaseRailLogic = new jl_IndexOutOfBoundsException;
-    $par1BlockBaseRailLogic.$suppressionEnabled = 1;
-    $par1BlockBaseRailLogic.$writableStackTrace = 1;
-    $rt_throw($par1BlockBaseRailLogic);
-};
-$java.nms_BlockBaseRailLogic_isPartOfTrack = function($this, $par1, $par2, $par3) {
-    var $var4, $var5;
-    $var4 = 0;
-    a: {
-        while ($var4 < $this.$railChunkPosition.$size0) {
-            $var5 = $this.$railChunkPosition;
-            if ($var4 < 0)
-                break a;
-            if ($var4 >= $var5.$size0)
-                break a;
-            $var5 = $var5.$array1.data[$var4];
-            if ($var5.$x4 == $par1 && $var5.$z5 == $par3)
-                return 1;
-            $var4 = $var4 + 1 | 0;
-        }
-        return 0;
-    }
-    $var5 = new jl_IndexOutOfBoundsException;
-    $var5.$suppressionEnabled = 1;
-    $var5.$writableStackTrace = 1;
-    $rt_throw($var5);
-};
-function nms_BlockBaseRailLogic_getNumberOfAdjacentTracks($this) {
-    var $var1;
-    $var1 = 0;
-    if ($java.nms_BlockBaseRailLogic_isMinecartTrack($this, $this.$railX, $this.$railY, $this.$railZ - 1 | 0))
-        $var1 = 1;
-    if ($java.nms_BlockBaseRailLogic_isMinecartTrack($this, $this.$railX, $this.$railY, $this.$railZ + 1 | 0))
-        $var1 = $var1 + 1 | 0;
-    if ($java.nms_BlockBaseRailLogic_isMinecartTrack($this, $this.$railX - 1 | 0, $this.$railY, $this.$railZ))
-        $var1 = $var1 + 1 | 0;
-    if ($java.nms_BlockBaseRailLogic_isMinecartTrack($this, $this.$railX + 1 | 0, $this.$railY, $this.$railZ))
-        $var1 = $var1 + 1 | 0;
-    return $var1;
-}
-$java.nms_BlockBaseRailLogic_canConnectTo = function($this, $par1BlockBaseRailLogic) {
-    return $java.nms_BlockBaseRailLogic_isRailChunkPositionCorrect($this, $par1BlockBaseRailLogic) ? 1 : $this.$railChunkPosition.$size0 == 2 ? 0 : !($this.$railChunkPosition.$size0 ? 0 : 1) ? 1 : 1;
-};
-$java.nms_BlockBaseRailLogic_connectToNeighbor = function($this, $par1BlockBaseRailLogic) {
-    var var$2, var$3, $var2, $var3, $var4, $var5, $var6, $ptr, $tmp;
-    $ptr = 0;
-    if ($rt_resuming()) {
-        var $thread = $rt_nativeThread();
-        $ptr = $thread.pop();$var6 = $thread.pop();$var5 = $thread.pop();$var4 = $thread.pop();$var3 = $thread.pop();$var2 = $thread.pop();var$3 = $thread.pop();var$2 = $thread.pop();$par1BlockBaseRailLogic = $thread.pop();$this = $thread.pop();
-    }
-    main: while (true) { switch ($ptr) {
-    case 0:
-        var$2 = $this.$railChunkPosition;
-        var$3 = new nms_ChunkPosition;
-        $var2 = $par1BlockBaseRailLogic.$railX;
-        $var3 = $par1BlockBaseRailLogic.$railY;
-        $var4 = $par1BlockBaseRailLogic.$railZ;
-        var$3.$x4 = $var2;
-        var$3.$y3 = $var3;
-        var$3.$z5 = $var4;
-        ju_ArrayList_add(var$2, var$3);
-        $var2 = $java.nms_BlockBaseRailLogic_isPartOfTrack($this, $this.$railX, $this.$railY, $this.$railZ - 1 | 0);
-        $var3 = $java.nms_BlockBaseRailLogic_isPartOfTrack($this, $this.$railX, $this.$railY, $this.$railZ + 1 | 0);
-        $var4 = $java.nms_BlockBaseRailLogic_isPartOfTrack($this, $this.$railX - 1 | 0, $this.$railY, $this.$railZ);
-        $var5 = $java.nms_BlockBaseRailLogic_isPartOfTrack($this, $this.$railX + 1 | 0, $this.$railY, $this.$railZ);
-        $var6 = (-1);
-        if (!(!$var2 && !$var3))
-            $var6 = 0;
-        if (!(!$var4 && !$var5))
-            $var6 = 1;
-        if (!$this.$isStraightRail) {
-            if ($var3 && $var5 && !$var2 && !$var4)
-                $var6 = 6;
-            if ($var3 && $var4 && !$var2 && !$var5)
-                $var6 = 7;
-            if ($var2 && $var4 && !$var3 && !$var5)
-                $var6 = 8;
-            if ($var2 && $var5 && !$var3 && !$var4)
-                $var6 = 9;
-        }
-        if (!$var6) {
-            if (nms_BlockRailBase_isRailBlock(nms_World_getBlockId($this.$logicWorld, $this.$railX, $this.$railY + 1 | 0, $this.$railZ - 1 | 0)))
-                $var6 = 4;
-            if (nms_BlockRailBase_isRailBlock(nms_World_getBlockId($this.$logicWorld, $this.$railX, $this.$railY + 1 | 0, $this.$railZ + 1 | 0)))
-                $var6 = 5;
-        }
-        if ($var6 == 1) {
-            if (nms_BlockRailBase_isRailBlock(nms_World_getBlockId($this.$logicWorld, $this.$railX + 1 | 0, $this.$railY + 1 | 0, $this.$railZ)))
-                $var6 = 2;
-            if (nms_BlockRailBase_isRailBlock(nms_World_getBlockId($this.$logicWorld, $this.$railX - 1 | 0, $this.$railY + 1 | 0, $this.$railZ)))
-                $var6 = 3;
-        }
-        if ($var6 < 0)
-            $var6 = 0;
-        if ($this.$isStraightRail)
-            $var6 = nms_World_getBlockMetadata($this.$logicWorld, $this.$railX, $this.$railY, $this.$railZ) & 8 | $var6;
-        $par1BlockBaseRailLogic = $this.$logicWorld;
-        $var3 = $this.$railX;
-        $var4 = $this.$railY;
-        $var5 = $this.$railZ;
-        $var2 = 3;
-        $ptr = 1;
-    case 1:
-        nms_World_setBlockMetadataWithNotify($par1BlockBaseRailLogic, $var3, $var4, $var5, $var6, $var2);
-        if ($rt_suspending()) {
-            break main;
-        }
-        return;
-    default: $rt_invalidPointer();
-    }}
-    $rt_nativeThread().push($this, $par1BlockBaseRailLogic, var$2, var$3, $var2, $var3, $var4, $var5, $var6, $ptr);
-};
-$java.nms_BlockBaseRailLogic_canConnectFrom = function($this, $par1, $par2, $par3) {
-    var $var4;
-    $var4 = new nms_ChunkPosition;
-    $var4.$x4 = $par1;
-    $var4.$y3 = $par2;
-    $var4.$z5 = $par3;
-    $var4 = $java.nms_BlockBaseRailLogic_getRailLogic($this, $var4);
-    if ($var4 === null)
-        return 0;
-    $java.nms_BlockBaseRailLogic_refreshConnectedTracks($var4);
-    return $java.nms_BlockBaseRailLogic_canConnectTo($var4, $this);
-};
-function nms_BlockBaseRailLogic_func_94511_a($this, $par1, $par2) {
-    var $var3, $var4, $var5, $var6, $var7, $var10, $var9, $ptr, $tmp;
-    $ptr = 0;
-    if ($rt_resuming()) {
-        var $thread = $rt_nativeThread();
-        $ptr = $thread.pop();$var9 = $thread.pop();$var10 = $thread.pop();$var7 = $thread.pop();$var6 = $thread.pop();$var5 = $thread.pop();$var4 = $thread.pop();$var3 = $thread.pop();$par2 = $thread.pop();$par1 = $thread.pop();$this = $thread.pop();
-    }
-    main: while (true) { switch ($ptr) {
-    case 0:
-        $var3 = $java.nms_BlockBaseRailLogic_canConnectFrom($this, $this.$railX, $this.$railY, $this.$railZ - 1 | 0);
-        $var4 = $java.nms_BlockBaseRailLogic_canConnectFrom($this, $this.$railX, $this.$railY, $this.$railZ + 1 | 0);
-        $var5 = $java.nms_BlockBaseRailLogic_canConnectFrom($this, $this.$railX - 1 | 0, $this.$railY, $this.$railZ);
-        $var6 = $java.nms_BlockBaseRailLogic_canConnectFrom($this, $this.$railX + 1 | 0, $this.$railY, $this.$railZ);
-        $var7 = (-1);
-        if (!(!$var3 && !$var4) && !$var5 && !$var6)
-            $var7 = 0;
-        if (!(!$var5 && !$var6) && !$var3 && !$var4)
-            $var7 = 1;
-        if (!$this.$isStraightRail) {
-            if ($var4 && $var6 && !$var3 && !$var5)
-                $var7 = 6;
-            if ($var4 && $var5 && !$var3 && !$var6)
-                $var7 = 7;
-            if ($var3 && $var5 && !$var4 && !$var6)
-                $var7 = 8;
-            if ($var3 && $var6 && !$var4 && !$var5)
-                $var7 = 9;
-        }
-        if ($var7 == (-1)) {
-            if (!(!$var3 && !$var4))
-                $var7 = 0;
-            if (!(!$var5 && !$var6))
-                $var7 = 1;
-            if (!$this.$isStraightRail) {
-                if (!$par1) {
-                    if ($var3 && $var5)
-                        $var7 = 8;
-                    if ($var6 && $var3)
-                        $var7 = 9;
-                    if ($var5 && $var4)
-                        $var7 = 7;
-                    if ($var4 && $var6)
-                        $var7 = 6;
-                } else {
-                    if ($var4 && $var6)
-                        $var7 = 6;
-                    if ($var5 && $var4)
-                        $var7 = 7;
-                    if ($var6 && $var3)
-                        $var7 = 9;
-                    if ($var3 && $var5)
-                        $var7 = 8;
-                }
-            }
-        }
-        if (!$var7) {
-            if (nms_BlockRailBase_isRailBlockAt($this.$logicWorld, $this.$railX, $this.$railY + 1 | 0, $this.$railZ - 1 | 0))
-                $var7 = 4;
-            if (nms_BlockRailBase_isRailBlockAt($this.$logicWorld, $this.$railX, $this.$railY + 1 | 0, $this.$railZ + 1 | 0))
-                $var7 = 5;
-        }
-        if ($var7 == 1) {
-            if (nms_BlockRailBase_isRailBlockAt($this.$logicWorld, $this.$railX + 1 | 0, $this.$railY + 1 | 0, $this.$railZ))
-                $var7 = 2;
-            if (nms_BlockRailBase_isRailBlockAt($this.$logicWorld, $this.$railX - 1 | 0, $this.$railY + 1 | 0, $this.$railZ))
-                $var7 = 3;
-        }
-        if ($var7 < 0)
-            $var7 = 0;
-        $java.nms_BlockBaseRailLogic_setBasicRail($this, $var7);
-        if ($this.$isStraightRail)
-            $var7 = nms_World_getBlockMetadata($this.$logicWorld, $this.$railX, $this.$railY, $this.$railZ) & 8 | $var7;
-        if (!$par2 && nms_World_getBlockMetadata($this.$logicWorld, $this.$railX, $this.$railY, $this.$railZ) == $var7)
-            return;
-        $var10 = $this.$logicWorld;
-        $par2 = $this.$railX;
-        $var9 = $this.$railY;
-        $var3 = $this.$railZ;
-        $par1 = 3;
-        $ptr = 1;
-    case 1:
-        nms_World_setBlockMetadataWithNotify($var10, $par2, $var9, $var3, $var7, $par1);
-        if ($rt_suspending()) {
-            break main;
-        }
-        $var9 = 0;
-        while ($var9 < ju_ArrayList_size($this.$railChunkPosition)) {
-            $var10 = $java.nms_BlockBaseRailLogic_getRailLogic($this, ju_ArrayList_get($this.$railChunkPosition, $var9));
-            if ($var10 !== null) {
-                $java.nms_BlockBaseRailLogic_refreshConnectedTracks($var10);
-                if ($java.nms_BlockBaseRailLogic_canConnectTo($var10, $this)) {
-                    $ptr = 2;
-                    continue main;
-                }
-            }
-            $var9 = $var9 + 1 | 0;
-        }
-        return;
-    case 2:
-        $java.nms_BlockBaseRailLogic_connectToNeighbor($var10, $this);
-        if ($rt_suspending()) {
-            break main;
-        }
-        while (true) {
-            $var9 = $var9 + 1 | 0;
-            if ($var9 >= ju_ArrayList_size($this.$railChunkPosition))
-                break;
-            $var10 = $java.nms_BlockBaseRailLogic_getRailLogic($this, ju_ArrayList_get($this.$railChunkPosition, $var9));
-            if ($var10 === null)
-                continue;
-            $java.nms_BlockBaseRailLogic_refreshConnectedTracks($var10);
-            if (!$java.nms_BlockBaseRailLogic_canConnectTo($var10, $this))
-                continue;
-            else {
-                continue main;
-            }
-        }
-        return;
-    default: $rt_invalidPointer();
-    }}
-    $rt_nativeThread().push($this, $par1, $par2, $var3, $var4, $var5, $var6, $var7, $var10, $var9, $ptr);
-}
 function nms_EntityHugeExplodeFX() {
     var a = this; nms_EntityFX.call(a);
     a.$timeSinceStart = 0;
@@ -225618,6 +225635,40 @@ $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;
@@ -225690,40 +225741,6 @@ $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;
@@ -229469,8 +229486,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_PLTE, 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,
 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,
@@ -230588,7 +230605,7 @@ nms_TextureClock, "TextureClock", 28, nms_TextureStitched, [], 0, 3, 0, ["$updat
 nms_TextureCompass, "TextureCompass", 28, nms_TextureStitched, [], 0, 3, 0, ["$updateAnimation", function() { nms_TextureCompass_updateAnimation(this); }],
 $java.otjb_TimerHandler, 0, jl_Object, [otj_JSObject], 3, 3, 0, 0,
 nlea_EaglerAdapterImpl2$12, 0, jl_Object, [$java.otjb_TimerHandler], 4, 0, 0, ["$onTimer$exported$0", function() { return $java.nlea_EaglerAdapterImpl2$12_onTimer$exported$0(this); }],
-$java.nms_SlotCreativeInventory, "SlotCreativeInventory", 28, $java.nms_Slot, [], 0, 0, 0, ["$onPickupFromSlot", function(var_1, var_2) { $java.nms_SlotCreativeInventory_onPickupFromSlot(this, var_1, var_2); }, "$isItemValid", function(var_1) { return $java.nms_SlotCreativeInventory_isItemValid(this, var_1); }, "$getStack", function() { return $java.nms_SlotCreativeInventory_getStack(this); }, "$getHasStack", function() { return $java.nms_SlotCreativeInventory_getHasStack(this); }, "$putStack", function(var_1)
+$java.nms_SlotCreativeInventory, "SlotCreativeInventory", 28, $java.nms_Slot, [], 0, 3, 0, ["$onPickupFromSlot", function(var_1, var_2) { $java.nms_SlotCreativeInventory_onPickupFromSlot(this, var_1, var_2); }, "$isItemValid", function(var_1) { return $java.nms_SlotCreativeInventory_isItemValid(this, var_1); }, "$getStack", function() { return $java.nms_SlotCreativeInventory_getStack(this); }, "$getHasStack", function() { return $java.nms_SlotCreativeInventory_getHasStack(this); }, "$putStack", function(var_1)
 { $java.nms_SlotCreativeInventory_putStack(this, var_1); }, "$onSlotChanged", function() { $java.nms_SlotCreativeInventory_onSlotChanged(this); }, "$getSlotStackLimit", function() { return $java.nms_SlotCreativeInventory_getSlotStackLimit(this); }, "$getBackgroundIconIndex", function() { return $java.nms_SlotCreativeInventory_getBackgroundIconIndex(this); }, "$decrStackSize0", function(var_1) { return $java.nms_SlotCreativeInventory_decrStackSize(this, var_1); }],
 nms_Enchantment, "Enchantment", 28, jl_Object, [], 1, 3, nms_Enchantment_$callClinit, ["$calcModifierDamage", function(var_1, var_2) { return $java.nms_Enchantment_calcModifierDamage(this, var_1, var_2); }, "$calcModifierLiving", function(var_1, var_2) { return $java.nms_Enchantment_calcModifierLiving(this, var_1, var_2); }, "$canApplyTogether", function(var_1) { return $java.nms_Enchantment_canApplyTogether(this, var_1); }, "$getName", function() { return $java.nms_Enchantment_getName(this); }, "$canApply",
 function(var_1) { return $java.nms_Enchantment_canApply(this, var_1); }],
@@ -230820,7 +230837,7 @@ $java.nms_MapCoord, "MapCoord", 28, jl_Object, [], 0, 3, 0, 0]);
 $rt_metadata([$java.ju_Formatter$FormatWriter, 0, jl_Object, [], 0, 0, 0, 0,
 ju_LinkedHashMap$2, 0, ju_AbstractCollection, [], 0, 0, 0, ["$size2", function() { return $java.ju_LinkedHashMap$2_size(this); }, "$iterator", function() { return $java.ju_LinkedHashMap$2_iterator(this); }],
 ju_Objects, 0, jl_Object, [], 4, 3, 0, 0,
-jur_MatchResultImpl, 0, jl_Object, [$java.jur_MatchResult], 0, 0, 0, 0,
+$java.jur_MatchResultImpl, 0, jl_Object, [$java.jur_MatchResult], 0, 0, 0, 0,
 ju_FormatterClosedException, "FormatterClosedException", 8, jl_IllegalStateException, [], 0, 3, 0, 0,
 otcit_FloatAnalyzer, 0, jl_Object, [], 4, 3, 0, 0,
 $java.nms_GuiConnecting, 0, nms_GuiScreen, [], 0, 3, 0, ["$updateScreen", function() { $java.nms_GuiConnecting_updateScreen(this); }, "$keyTyped", function(var_1, var_2) { $java.nms_GuiConnecting_keyTyped(this, var_1, var_2); }, "$initGui", function() { $java.nms_GuiConnecting_initGui(this); }, "$actionPerformed", function(var_1) { $java.nms_GuiConnecting_actionPerformed(this, var_1); }, "$drawScreen", function(var_1, var_2, var_3) { $java.nms_GuiConnecting_drawScreen(this, var_1, var_2, var_3); }],
@@ -230897,8 +230914,8 @@ nms_EntityWitherAttackFilter, 0, jl_Object, [nms_IEntitySelector], 4, 0, 0, ["$i
 maan_Layer, "Layer", 25, jl_Object, [], 0, 3, 0, 0,
 maan_Note, "Note", 25, jl_Object, [], 0, 3, 0, 0,
 maan_Instrument, 0, jl_Enum, [], 12, 3, 0, 0,
-nms_WorldType, 0, jl_Object, [], 0, 3, 0, 0,
 nms_EnumGameType, 0, jl_Enum, [], 12, 3, 0, 0,
+nms_WorldType, 0, jl_Object, [], 0, 3, 0, 0,
 nms_InventoryCrafting, 0, jl_Object, [nms_IInventory], 0, 3, 0, ["$getStackInSlot", function(var_1) { return $java.nms_InventoryCrafting_getStackInSlot(this, var_1); }, "$decrStackSize", function(var_1, var_2) { return $java.nms_InventoryCrafting_decrStackSize(this, var_1, var_2); }, "$setInventorySlotContents", function(var_1, var_2) { $java.nms_InventoryCrafting_setInventorySlotContents(this, var_1, var_2); }, "$getInventoryStackLimit", function() { return $java.nms_InventoryCrafting_getInventoryStackLimit(this);
 }, "$onInventoryChanged", function() { $java.nms_InventoryCrafting_onInventoryChanged(this); }],
 nms_ContainerSheep, 0, nms_Container, [], 0, 0, 0, 0,
@@ -230913,31 +230930,31 @@ 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,
-$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_Explosion, 0, jl_Object, [], 0, 3, 0, 0,
+nms_WorldProviderSurface, 0, nms_WorldProvider, [], 0, 3, 0, 0,
 nms_ScoreObjectiveCriteria, 0, jl_Object, [], 3, 3, 0, 0,
+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); }],
 $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_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,
 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_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); }],
 $java.nms_GameRuleValue, "GameRuleValue", 28, jl_Object, [], 0, 0, 0, 0,
+nms_MerchantRecipe, "MerchantRecipe", 28, jl_Object, [], 0, 3, 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([$java.nms_ScoreDummyCriteria, "ScoreDummyCriteria", 28, jl_Object, [nms_ScoreObjectiveCriteria], 0, 3, 0, 0,
+}, "$onInventoryChanged", function() { $java.nms_InventoryMerchant_onInventoryChanged(this); }]]);
+$rt_metadata([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); }],
+$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); }],
-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); }],
 nms_InventoryCraftResult, 0, jl_Object, [nms_IInventory], 0, 3, 0, ["$getStackInSlot", function(var_1) { return $java.nms_InventoryCraftResult_getStackInSlot(this, var_1); }, "$decrStackSize", function(var_1, var_2) { return $java.nms_InventoryCraftResult_decrStackSize(this, var_1, var_2); }, "$setInventorySlotContents", function(var_1, var_2) { $java.nms_InventoryCraftResult_setInventorySlotContents(this, var_1, var_2); }, "$getInventoryStackLimit", function() { return $java.nms_InventoryCraftResult_getInventoryStackLimit(this);
 }, "$onInventoryChanged", function() { $java.nms_InventoryCraftResult_onInventoryChanged(this); }],
 $java.nms_SlotCrafting, "SlotCrafting", 28, $java.nms_Slot, [], 0, 3, 0, ["$isItemValid", function(var_1) { return $java.nms_SlotCrafting_isItemValid(this, var_1); }, "$decrStackSize0", function(var_1) { return $java.nms_SlotCrafting_decrStackSize(this, var_1); }, "$onCrafting", function(var_1, var_2) { $java.nms_SlotCrafting_onCrafting(this, var_1, var_2); }, "$onPickupFromSlot", function(var_1, var_2) { $java.nms_SlotCrafting_onPickupFromSlot(this, var_1, var_2); }],
@@ -231020,6 +231037,7 @@ cjj_Deflater, 0, cjj_ZStream, [], 4, 3, 0, 0,
 $java.nms_NibbleArray, 0, jl_Object, [], 0, 3, 0, 0,
 nms_FurnaceRecipes, 0, jl_Object, [], 0, 3, 0, 0,
 nms_EnumCreatureAttribute, 0, jl_Enum, [], 12, 3, 0, 0,
+nms_BlockBaseRailLogic, 0, jl_Object, [], 0, 3, 0, 0,
 nms_InventoryLargeChest, 0, jl_Object, [nms_IInventory], 0, 3, 0, ["$getSizeInventory", function() { return $java.nms_InventoryLargeChest_getSizeInventory(this); }, "$getInvName", function() { return $java.nms_InventoryLargeChest_getInvName(this); }, "$isInvNameLocalized", function() { return $java.nms_InventoryLargeChest_isInvNameLocalized(this); }, "$getStackInSlot", function(var_1) { return $java.nms_InventoryLargeChest_getStackInSlot(this, var_1); }, "$decrStackSize", function(var_1, var_2) { return $java.nms_InventoryLargeChest_decrStackSize(this,
 var_1, var_2); }, "$setInventorySlotContents", function(var_1, var_2) { $java.nms_InventoryLargeChest_setInventorySlotContents(this, var_1, var_2); }, "$getInventoryStackLimit", function() { return $java.nms_InventoryLargeChest_getInventoryStackLimit(this); }, "$onInventoryChanged", function() { $java.nms_InventoryLargeChest_onInventoryChanged(this); }, "$isUseableByPlayer", function(var_1) { return $java.nms_InventoryLargeChest_isUseableByPlayer(this, var_1); }, "$openChest", function() { $java.nms_InventoryLargeChest_openChest(this);
 }, "$closeChest", function() { $java.nms_InventoryLargeChest_closeChest(this); }, "$isStackValidForSlot", function(var_1, var_2) { return $java.nms_InventoryLargeChest_isStackValidForSlot(this, var_1, var_2); }],
@@ -231027,7 +231045,6 @@ nms_GuiEditSign, 0, nms_GuiScreen, [], 0, 3, nms_GuiEditSign_$callClinit, ["$ini
 { $java.nms_GuiEditSign_drawScreen(this, var_1, var_2, var_3); }],
 nms_GuiCommandBlock, 0, nms_GuiScreen, [], 0, 3, 0, ["$updateScreen", function() { $java.nms_GuiCommandBlock_updateScreen(this); }, "$initGui", function() { $java.nms_GuiCommandBlock_initGui(this); }, "$onGuiClosed", function() { $java.nms_GuiCommandBlock_onGuiClosed(this); }, "$actionPerformed", function(var_1) { $java.nms_GuiCommandBlock_actionPerformed(this, var_1); }, "$keyTyped", function(var_1, var_2) { $java.nms_GuiCommandBlock_keyTyped(this, var_1, var_2); }, "$mouseClicked", function(var_1, var_2, var_3)
 { $java.nms_GuiCommandBlock_mouseClicked(this, var_1, var_2, var_3); }, "$drawScreen", function(var_1, var_2, var_3) { $java.nms_GuiCommandBlock_drawScreen(this, var_1, var_2, var_3); }],
-nms_BlockBaseRailLogic, 0, jl_Object, [], 0, 3, 0, 0,
 nms_EntityHugeExplodeFX, "EntityHugeExplodeFX", 28, nms_EntityFX, [], 0, 3, 0, ["$renderParticle", function(var_1, var_2, var_3, var_4, var_5, var_6, var_7) { $java.nms_EntityHugeExplodeFX_renderParticle(this, var_1, var_2, var_3, var_4, var_5, var_6, var_7); }, "$onUpdate", function() { $java.nms_EntityHugeExplodeFX_onUpdate(this); }, "$getFXLayer", function() { return $java.nms_EntityHugeExplodeFX_getFXLayer(this); }],
 nms_EntityBubbleFX, "EntityBubbleFX", 28, nms_EntityFX, [], 0, 3, 0, ["$onUpdate", function() { $java.nms_EntityBubbleFX_onUpdate(this); }],
 nms_EntitySuspendFX, "EntitySuspendFX", 28, nms_EntityFX, [], 0, 3, 0, ["$onUpdate", function() { $java.nms_EntitySuspendFX_onUpdate(this); }],
@@ -231055,10 +231072,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_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_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); }],
 $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); }],
@@ -231232,7 +231249,7 @@ $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", "/title/win.txt", "PLAYERNAME", "XXXXXXXX", "/title/credits.txt", "\t", "    ", "[C]", "%blur%/gui/background.png", "dummy", "deathCount", "playerKillCount",
+"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", "NOT_SET", "SURVIVAL", "survival", "CREATIVE", "creative", "ADVENTURE", "adventure", "flat", "largeBiomes", "default_1_1", "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 ",
diff --git a/src/main/java/net/minecraft/src/GuiContainerCreative.java b/src/main/java/net/minecraft/src/GuiContainerCreative.java
index bbf4f14..5c43a89 100644
--- a/src/main/java/net/minecraft/src/GuiContainerCreative.java
+++ b/src/main/java/net/minecraft/src/GuiContainerCreative.java
@@ -52,7 +52,7 @@ public class GuiContainerCreative extends InventoryEffectRenderer {
 		}
 	}
 
-	protected void handleMouseClick(Slot par1Slot, int par2, int par3, int par4) {
+	public void handleMouseClick(Slot par1Slot, int par2, int par3, int par4) {
 		this.field_74234_w = true;
 		boolean var5 = par4 == 1;
 		par4 = par2 == -999 && par4 == 0 ? 4 : par4;