diff --git a/CompileJS.sh b/CompileJS.sh
index 83abacc..4d6d4ca 100755
--- a/CompileJS.sh
+++ b/CompileJS.sh
@@ -1,3 +1,3 @@
-#!/bin/sh
-chmod +x gradlew
+#!/bin/sh
+chmod +x gradlew
 ./gradlew generateJavascript
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 5436ca9..80fc672 100755
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ teavm.js {
     obfuscated = true
     sourceMap = true
     targetFileName = "../classes.js"
-    // optimization = OptimizationLevel.ADVANCED
+    optimization = org.teavm.gradle.api.OptimizationLevel.AGGRESSIVE
     outOfProcess = false
     fastGlobalAnalysis = false
     processMemory = 512
diff --git a/desktopRuntime/eclipseProject/.classpath b/desktopRuntime/eclipseProject/.classpath
index 6bbb5c5..210b72d 100755
--- a/desktopRuntime/eclipseProject/.classpath
+++ b/desktopRuntime/eclipseProject/.classpath
@@ -17,5 +17,6 @@
 	<classpathentry kind="lib" path="deps_fix/lwjgl-openal.jar"/>
 	<classpathentry kind="lib" path="deps_fix/lwjgl-opengles.jar"/>
 	<classpathentry kind="lib" path="deps_fix/soundsystem-20120107.jar"/>
+	<classpathentry kind="lib" path="deps_fix/webrtc-java-0.8.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/desktopRuntime/eclipseProject/deps_fix/webrtc-java-0.8.0.jar b/desktopRuntime/eclipseProject/deps_fix/webrtc-java-0.8.0.jar
new file mode 100755
index 0000000..f6eac1a
Binary files /dev/null and b/desktopRuntime/eclipseProject/deps_fix/webrtc-java-0.8.0.jar differ
diff --git a/desktopRuntime/libwebrtc-java.so b/desktopRuntime/libwebrtc-java.so
new file mode 100755
index 0000000..4ffd25a
Binary files /dev/null and b/desktopRuntime/libwebrtc-java.so differ
diff --git a/desktopRuntime/resources/SignedClientTemplate.txt b/desktopRuntime/resources/SignedClientTemplate.txt
index e47b8ad..2b20501 100755
--- a/desktopRuntime/resources/SignedClientTemplate.txt
+++ b/desktopRuntime/resources/SignedClientTemplate.txt
@@ -8,8 +8,8 @@
 <title>EaglercraftX 1.8</title>
 <meta property="og:locale" content="en-US" />
 <meta property="og:type" content="website" />
-<meta property="og:title" content="EaglercraftX 1.8 Offline" />
-<meta property="og:description" content="this file is not a website, whoever uploaded it to this URL is a dumbass" />
+<meta property="og:title" content="EaglercraftX 1.8" />
+<meta property="og:description" content="Play minecraft 1.8 in your browser" />
 <script type="text/javascript">
 "use strict";
 const relayId = Math.floor(Math.random() * 3);
@@ -31,10 +31,15 @@ window.eaglercraftXOptsHints = {
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 </script>
+<style type="eaglercraft" id="eaglercraftXClientSignature">data:application/octet-stream;base64,${client_signature}</style>
+<style type="eaglercraft" id="eaglercraftXClientBundle">data:application/octet-stream;base64,${client_bundle}</style>
 <script type="text/javascript">
 "use strict";
-window.eaglercraftXClientSignature = "data:application/octet-stream;base64,${client_signature}";
-window.eaglercraftXClientBundle = "data:application/octet-stream;base64,${client_bundle}";
+(function(){
+	function eaglerBundleUnwrap(tagIn) { const e = document.getElementById(tagIn); const ret = e.innerText; e.remove(); return ret;  }
+	window.eaglercraftXClientSignature = eaglerBundleUnwrap("eaglercraftXClientSignature");
+	window.eaglercraftXClientBundle = eaglerBundleUnwrap("eaglercraftXClientBundle");
+})();
 </script>
 <script type="text/javascript">
 "use strict";
diff --git a/desktopRuntime/resources/assets/eagler/CREDITS.txt b/desktopRuntime/resources/assets/eagler/CREDITS.txt
index 23ab9c7..1c81c30 100755
--- a/desktopRuntime/resources/assets/eagler/CREDITS.txt
+++ b/desktopRuntime/resources/assets/eagler/CREDITS.txt
@@ -539,6 +539,28 @@
  
  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  
+ Project Name: webrtc-java
+ Project Author: Alex Andres
+ Project URL: https://github.com/devopvoid/webrtc-java
+
+ Used For: WebRTC LAN worlds in desktop runtime
+
+ * Copyright 2019 Alex Andres
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ 
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ 
  Project Name: Netty
  Project Author: Netty Project
  Project URL: https://netty.io/
diff --git a/desktopRuntime/resources/assets/eagler/glsl/deferred/deferred_core.vsh b/desktopRuntime/resources/assets/eagler/glsl/deferred/deferred_core.vsh
index 30ebf7c..e0610aa 100755
--- a/desktopRuntime/resources/assets/eagler/glsl/deferred/deferred_core.vsh
+++ b/desktopRuntime/resources/assets/eagler/glsl/deferred/deferred_core.vsh
@@ -1,116 +1,116 @@
-#line 2
-
-/*
- * Copyright (c) 2023 lax1dude. All Rights Reserved.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- */
-
-in vec3 a_position3f;
-
-#ifdef COMPILE_TEXTURE_ATTRIB
-in vec2 a_texture2f;
-out vec2 v_texture2f;
-uniform mat4 u_textureMat4f01;
-#endif
-
-#ifdef COMPILE_COLOR_ATTRIB
-in vec4 a_color4f;
-out vec4 v_color4f;
-#endif
-
-#ifdef COMPILE_NORMAL_ATTRIB
-in vec4 a_normal4f;
-out vec3 v_normal3f;
-out float v_block1f;
-#endif
-
-#ifdef COMPILE_STATE_WAVING_BLOCKS
-uniform mat4 u_modelMatrix4f;
-uniform mat4 u_viewMatrix4f;
-uniform vec3 u_wavingBlockOffset3f;
-uniform vec4 u_wavingBlockParam4f;
-#ifndef COMPILE_NORMAL_ATTRIB
-uniform float u_blockConstant1f;
-#endif
-#define DO_COMPILE_STATE_WAVING_BLOCKS
-#define FAKE_SIN(valueIn, valueOut)\
-	valueOut = abs(1.0 - fract(valueIn * 0.159155) * 2.0);\
-	valueOut = valueOut * valueOut * (3.0 - 2.0 * valueOut) * 2.0 - 1.0;
-#define LIB_INCLUDE_WAVING_BLOCKS_FUNCTION
-#endif
-
-#EAGLER INCLUDE (2) "eagler:glsl/deferred/lib/waving_blocks.glsl"
-
-#ifdef COMPILE_NORMAL_MATERIAL_TEXTURE
-out vec3 v_viewdir3f;
-#endif
-
-#ifdef COMPILE_LIGHTMAP_ATTRIB
-in vec2 a_lightmap2f;
-out vec2 v_lightmap2f;
-uniform mat4 u_textureMat4f02;
-#endif
-
-uniform mat4 u_modelviewMat4f;
-uniform mat4 u_projectionMat4f;
-
-#define TEX_MAT3(mat4In) mat3(mat4In[0].xyw,mat4In[1].xyw,mat4In[3].xyw)
-
-void main() {
-
-#ifdef COMPILE_TEXTURE_ATTRIB
-	vec3 v_textureTmp3f = TEX_MAT3(u_textureMat4f01) * vec3(a_texture2f, 1.0);
-	v_texture2f = v_textureTmp3f.xy / v_textureTmp3f.z;
-#endif
-
-#ifdef COMPILE_COLOR_ATTRIB
-	v_color4f = a_color4f;
-#endif
-
-#ifdef COMPILE_NORMAL_ATTRIB
-	v_normal3f = normalize(mat3(u_modelviewMat4f) * a_normal4f.xyz);
-	float blockId = v_block1f = floor((a_normal4f.w + 1.0) * 127.0 + 0.5);
-#endif
-
-#ifdef COMPILE_LIGHTMAP_ATTRIB
-	vec3 v_lightmapTmp3f = TEX_MAT3(u_textureMat4f02) * vec3(a_lightmap2f, 1.0);
-	v_lightmap2f = v_lightmapTmp3f.xy / v_lightmapTmp3f.z;
-#endif
-
-	vec4 pos = vec4(a_position3f, 1.0);
-
-#ifdef DO_COMPILE_STATE_WAVING_BLOCKS
-#ifndef COMPILE_NORMAL_ATTRIB
-	float blockId = u_blockConstant1f;
-#endif
-#ifdef COMPILE_LIGHTMAP_ATTRIB
-	if(v_lightmap2f.y > 0.33) {
-		COMPUTE_WAVING_BLOCKS(pos, min(v_lightmap2f.y * 3.0 - 1.0, 1.0), 24.0, blockId, u_modelMatrix4f, u_viewMatrix4f, u_modelviewMat4f, u_wavingBlockOffset3f, u_wavingBlockParam4f)
-	}else {
-		pos = u_modelviewMat4f * pos;
-	}
-#else
-	COMPUTE_WAVING_BLOCKS(pos, 1.0, 32.0, blockId, u_modelMatrix4f, u_viewMatrix4f, u_modelviewMat4f, u_wavingBlockOffset3f, u_wavingBlockParam4f)
-#endif
-#else
-	pos = u_modelviewMat4f * pos;
-#endif
-
-#ifdef COMPILE_NORMAL_MATERIAL_TEXTURE
-	v_viewdir3f = pos.xyz / pos.w;
-#endif
-
-	gl_Position = u_projectionMat4f * pos;
-
-}
+#line 2
+
+/*
+ * Copyright (c) 2023 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+
+in vec3 a_position3f;
+
+#ifdef COMPILE_TEXTURE_ATTRIB
+in vec2 a_texture2f;
+out vec2 v_texture2f;
+uniform mat4 u_textureMat4f01;
+#endif
+
+#ifdef COMPILE_COLOR_ATTRIB
+in vec4 a_color4f;
+out vec4 v_color4f;
+#endif
+
+#ifdef COMPILE_NORMAL_ATTRIB
+in vec4 a_normal4f;
+out vec3 v_normal3f;
+out float v_block1f;
+#endif
+
+#ifdef COMPILE_STATE_WAVING_BLOCKS
+uniform mat4 u_modelMatrix4f;
+uniform mat4 u_viewMatrix4f;
+uniform vec3 u_wavingBlockOffset3f;
+uniform vec4 u_wavingBlockParam4f;
+#ifndef COMPILE_NORMAL_ATTRIB
+uniform float u_blockConstant1f;
+#endif
+#define DO_COMPILE_STATE_WAVING_BLOCKS
+#define FAKE_SIN(valueIn, valueOut)\
+	valueOut = abs(1.0 - fract(valueIn * 0.159155) * 2.0);\
+	valueOut = valueOut * valueOut * (3.0 - 2.0 * valueOut) * 2.0 - 1.0;
+#define LIB_INCLUDE_WAVING_BLOCKS_FUNCTION
+#endif
+
+#EAGLER INCLUDE (2) "eagler:glsl/deferred/lib/waving_blocks.glsl"
+
+#ifdef COMPILE_NORMAL_MATERIAL_TEXTURE
+out vec3 v_viewdir3f;
+#endif
+
+#ifdef COMPILE_LIGHTMAP_ATTRIB
+in vec2 a_lightmap2f;
+out vec2 v_lightmap2f;
+uniform mat4 u_textureMat4f02;
+#endif
+
+uniform mat4 u_modelviewMat4f;
+uniform mat4 u_projectionMat4f;
+
+#define TEX_MAT3(mat4In) mat3(mat4In[0].xyw,mat4In[1].xyw,mat4In[3].xyw)
+
+void main() {
+
+#ifdef COMPILE_TEXTURE_ATTRIB
+	vec3 v_textureTmp3f = TEX_MAT3(u_textureMat4f01) * vec3(a_texture2f, 1.0);
+	v_texture2f = v_textureTmp3f.xy / v_textureTmp3f.z;
+#endif
+
+#ifdef COMPILE_COLOR_ATTRIB
+	v_color4f = a_color4f;
+#endif
+
+#ifdef COMPILE_NORMAL_ATTRIB
+	v_normal3f = normalize(mat3(u_modelviewMat4f) * a_normal4f.xyz);
+	float blockId = v_block1f = floor((a_normal4f.w + 1.0) * 127.0 + 0.5);
+#endif
+
+#ifdef COMPILE_LIGHTMAP_ATTRIB
+	vec3 v_lightmapTmp3f = TEX_MAT3(u_textureMat4f02) * vec3(a_lightmap2f, 1.0);
+	v_lightmap2f = v_lightmapTmp3f.xy / v_lightmapTmp3f.z;
+#endif
+
+	vec4 pos = vec4(a_position3f, 1.0);
+
+#ifdef DO_COMPILE_STATE_WAVING_BLOCKS
+#ifndef COMPILE_NORMAL_ATTRIB
+	float blockId = u_blockConstant1f;
+#endif
+#ifdef COMPILE_LIGHTMAP_ATTRIB
+	if(v_lightmap2f.y > 0.33) {
+		COMPUTE_WAVING_BLOCKS(pos, min(v_lightmap2f.y * 3.0 - 1.0, 1.0), 24.0, blockId, u_modelMatrix4f, u_viewMatrix4f, u_modelviewMat4f, u_wavingBlockOffset3f, u_wavingBlockParam4f)
+	}else {
+		pos = u_modelviewMat4f * pos;
+	}
+#else
+	COMPUTE_WAVING_BLOCKS(pos, 1.0, 32.0, blockId, u_modelMatrix4f, u_viewMatrix4f, u_modelviewMat4f, u_wavingBlockOffset3f, u_wavingBlockParam4f)
+#endif
+#else
+	pos = u_modelviewMat4f * pos;
+#endif
+
+#ifdef COMPILE_NORMAL_MATERIAL_TEXTURE
+	v_viewdir3f = pos.xyz / pos.w;
+#endif
+
+	gl_Position = u_projectionMat4f * pos;
+
+}
diff --git a/desktopRuntime/resources/assets/eagler/glsl/deferred/post_tonemap.fsh b/desktopRuntime/resources/assets/eagler/glsl/deferred/post_tonemap.fsh
index ff235bf..3064179 100755
--- a/desktopRuntime/resources/assets/eagler/glsl/deferred/post_tonemap.fsh
+++ b/desktopRuntime/resources/assets/eagler/glsl/deferred/post_tonemap.fsh
@@ -34,7 +34,7 @@ void main() {
 	float lumaHDR = textureLod(u_framebufferLumaAvgInput, vec2(0.5), 0.0).r;
 	vec3 input3f = textureLod(u_lightingHDRFramebufferTexture, v_position2f, 0.0).rgb;
 
-	input3f /= (0.1 + clamp(lumaHDR * 6.0, 0.2, 4.0));
+	input3f /= (0.07 + clamp(lumaHDR * 6.0, 0.2, 4.0));
 
 	input3f *= u_exposure3f;
 
diff --git a/desktopRuntime/resources/assets/minecraft/lang/en_US.lang b/desktopRuntime/resources/assets/minecraft/lang/en_US.lang
index 22f22fe..a3e5723 100755
--- a/desktopRuntime/resources/assets/minecraft/lang/en_US.lang
+++ b/desktopRuntime/resources/assets/minecraft/lang/en_US.lang
@@ -44,6 +44,41 @@ eaglercraft.editProfile.playerSkin=Player Skin
 eaglercraft.editProfile.addSkin=Add Skin
 eaglercraft.editProfile.clearSkin=Clear List
 
+eaglercraft.editProfile.importExport=Import/Export
+
+eaglercraft.settingsBackup.importExport.title=What do you wanna do?
+eaglercraft.settingsBackup.importExport.import=Import Profile and Settings...
+eaglercraft.settingsBackup.importExport.export=Export Profile and Settings...
+
+eaglercraft.settingsBackup.import.title=Import Profile and Settings
+eaglercraft.settingsBackup.import.option.profile=Import Profile:
+eaglercraft.settingsBackup.import.option.settings=Import Settings:
+eaglercraft.settingsBackup.import.option.servers=Import Servers:
+eaglercraft.settingsBackup.import.option.resourcePacks=Resource Packs:
+eaglercraft.settingsBackup.import.option.import=Import
+
+eaglercraft.settingsBackup.export.title=Export Profile and Settings
+eaglercraft.settingsBackup.export.option.profile=Export Profile:
+eaglercraft.settingsBackup.export.option.settings=Export Settings:
+eaglercraft.settingsBackup.export.option.servers=Export Servers:
+eaglercraft.settingsBackup.export.option.resourcePacks=Resource Packs:
+eaglercraft.settingsBackup.export.option.export=Export
+
+eaglercraft.settingsBackup.exporting.1=Exporting Profile...
+eaglercraft.settingsBackup.exporting.2=Please Wait.
+
+eaglercraft.settingsBackup.exporting.failed.1=Export Failed!
+eaglercraft.settingsBackup.exporting.failed.2=Could not compile EPK
+
+eaglercraft.settingsBackup.importing.1=Importing Profile...
+eaglercraft.settingsBackup.importing.2=Please Wait.
+
+eaglercraft.settingsBackup.importing.failed.1=Import Failed!
+eaglercraft.settingsBackup.importing.failed.2=Could not load EPK
+
+eaglercraft.resourcePack.importFailed.1=Import Failed!
+eaglercraft.resourcePack.importFailed.2=Could not import ZIP file
+
 eaglercraft.singleplayer.integratedStartup=Starting integrated server
 
 eaglercraft.addServer.SSLWarn1=you are on an https: page!
diff --git a/desktopRuntime/webrtc-java-0.8.0.jar b/desktopRuntime/webrtc-java-0.8.0.jar
new file mode 100755
index 0000000..f6eac1a
Binary files /dev/null and b/desktopRuntime/webrtc-java-0.8.0.jar differ
diff --git a/desktopRuntime/webrtc-java.dll b/desktopRuntime/webrtc-java.dll
new file mode 100755
index 0000000..00b5ad5
Binary files /dev/null and b/desktopRuntime/webrtc-java.dll differ
diff --git a/gradlew b/gradlew
index accc54f..2fe81a7 100755
--- a/gradlew
+++ b/gradlew
@@ -1,183 +1,183 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-exec "$JAVACMD" "$@"
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/javascript/SignedClientTemplate.txt b/javascript/SignedClientTemplate.txt
index e47b8ad..2b20501 100755
--- a/javascript/SignedClientTemplate.txt
+++ b/javascript/SignedClientTemplate.txt
@@ -8,8 +8,8 @@
 <title>EaglercraftX 1.8</title>
 <meta property="og:locale" content="en-US" />
 <meta property="og:type" content="website" />
-<meta property="og:title" content="EaglercraftX 1.8 Offline" />
-<meta property="og:description" content="this file is not a website, whoever uploaded it to this URL is a dumbass" />
+<meta property="og:title" content="EaglercraftX 1.8" />
+<meta property="og:description" content="Play minecraft 1.8 in your browser" />
 <script type="text/javascript">
 "use strict";
 const relayId = Math.floor(Math.random() * 3);
@@ -31,10 +31,15 @@ window.eaglercraftXOptsHints = {
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 </script>
+<style type="eaglercraft" id="eaglercraftXClientSignature">data:application/octet-stream;base64,${client_signature}</style>
+<style type="eaglercraft" id="eaglercraftXClientBundle">data:application/octet-stream;base64,${client_bundle}</style>
 <script type="text/javascript">
 "use strict";
-window.eaglercraftXClientSignature = "data:application/octet-stream;base64,${client_signature}";
-window.eaglercraftXClientBundle = "data:application/octet-stream;base64,${client_bundle}";
+(function(){
+	function eaglerBundleUnwrap(tagIn) { const e = document.getElementById(tagIn); const ret = e.innerText; e.remove(); return ret;  }
+	window.eaglercraftXClientSignature = eaglerBundleUnwrap("eaglercraftXClientSignature");
+	window.eaglercraftXClientBundle = eaglerBundleUnwrap("eaglercraftXClientBundle");
+})();
 </script>
 <script type="text/javascript">
 "use strict";
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformApplication.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformApplication.java
index 1ffbe8c..7289c53 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformApplication.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformApplication.java
@@ -21,6 +21,7 @@ import javax.swing.JOptionPane;
 import javax.swing.filechooser.FileFilter;
 
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.internal.lwjgl.MainMenuCreditsDialog;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
@@ -204,8 +205,15 @@ public class PlatformApplication {
 		fileChooserResultObject = null;
 	}
 
+	private static MainMenuCreditsDialog creditsDialog = null;
+
 	public static void openCreditsPopup(String text) {
-		
+		if(creditsDialog == null) {
+			creditsDialog = new MainMenuCreditsDialog();
+		}
+		creditsDialog.setCreditsText(text);
+		creditsDialog.setLocationRelativeTo(null);
+		creditsDialog.setVisible(true);
 	}
 
 	private static final File downloadsDirectory = new File("downloads");
@@ -239,6 +247,11 @@ public class PlatformApplication {
 		}
 
 		downloadsLogger.info("Saved {} byte file to: {}", fileContents.length, f.getAbsolutePath());
+
+		try {
+			Desktop.getDesktop().open(downloadsDirectory);
+		}catch(Throwable t) {
+		}
 	}
 
 	public static void addLogMessage(String logMessage, boolean isError) {
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAudio.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAudio.java
index 7963e85..02affcc 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAudio.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAudio.java
@@ -2,7 +2,6 @@ package net.lax1dude.eaglercraft.v1_8.internal;
 
 import java.net.URL;
 
-import net.lax1dude.eaglercraft.v1_8.internal.PlatformAudio.IAudioCacheLoader;
 import net.lax1dude.eaglercraft.v1_8.internal.paulscode.lwjgl3.LibraryLWJGLOpenAL;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformFilesystem.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformFilesystem.java
index 248f0fa..9894511 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformFilesystem.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformFilesystem.java
@@ -6,12 +6,10 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
-import net.lax1dude.eaglercraft.v1_8.internal.lwjgl.LWJGLEntryPoint;
 import net.lax1dude.eaglercraft.v1_8.internal.vfs2.EaglerFileSystemException;
 import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFSIterator2.BreakLoop;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
-import net.lax1dude.eaglercraft.v1_8.sp.server.internal.lwjgl.DesktopIntegratedServer;
 
 /**
  * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
@@ -35,20 +33,12 @@ public class PlatformFilesystem {
 	public static final File filesystemRoot = (new File("filesystem/sp")).getAbsoluteFile();
 
 	public static void initialize() {
-		assertThread();
 		if(!filesystemRoot.isDirectory() && !filesystemRoot.mkdirs()) {
 			throw new EaglerFileSystemException("Could not create directory for virtual filesystem: " + filesystemRoot.getAbsolutePath());
 		}
 	}
 
-	private static void assertThread() {
-		if(Thread.currentThread() != DesktopIntegratedServer.serverThread) {
-			throw new UnsupportedOperationException("[DEBUG CHECK] VFS2 is currently only initialized for server contexts!");
-		}
-	}
-
 	public static boolean eaglerDelete(String pathName) {
-		assertThread();
 		File f = getJREFile(pathName);
 		if(!f.exists()) {
 			logger.warn("Tried to delete file that doesn't exist: \"{}\"", pathName);
@@ -62,7 +52,6 @@ public class PlatformFilesystem {
 	}
 
 	public static ByteBuffer eaglerRead(String pathName) {
-		assertThread();
 		File f = getJREFile(pathName);
 		if(f.isFile()) {
 			long fileSize = f.length();
@@ -96,7 +85,6 @@ public class PlatformFilesystem {
 	}
 
 	public static void eaglerWrite(String pathName, ByteBuffer data) {
-		assertThread();
 		File f = getJREFile(pathName);
 		File p = f.getParentFile();
 		if(!p.isDirectory()) {
@@ -105,7 +93,7 @@ public class PlatformFilesystem {
 			}
 		}
 		try(FileOutputStream fos = new FileOutputStream(f)) {
-			byte[] copyBuffer = new byte[4096];
+			byte[] copyBuffer = new byte[Math.min(4096, data.remaining())];
 			int i;
 			while((i = data.remaining()) > 0) {
 				if(i > copyBuffer.length) {
@@ -120,12 +108,10 @@ public class PlatformFilesystem {
 	}
 
 	public static boolean eaglerExists(String pathName) {
-		assertThread();
 		return getJREFile(pathName).isFile();
 	}
 
 	public static boolean eaglerMove(String pathNameOld, String pathNameNew) {
-		assertThread();
 		File f1 = getJREFile(pathNameOld);
 		File f2 = getJREFile(pathNameNew);
 		if(f2.exists()) {
@@ -142,7 +128,6 @@ public class PlatformFilesystem {
 	}
 
 	public static int eaglerCopy(String pathNameOld, String pathNameNew) {
-		assertThread();
 		File f1 = getJREFile(pathNameOld);
 		File f2 = getJREFile(pathNameNew);
 		if(!f1.isFile()) {
@@ -174,7 +159,6 @@ public class PlatformFilesystem {
 	}
 
 	public static int eaglerSize(String pathName) {
-		assertThread();
 		File f = getJREFile(pathName);
 		if(f.isFile()) {
 			long fileSize = f.length();
@@ -186,7 +170,6 @@ public class PlatformFilesystem {
 	}
 
 	public static void eaglerIterate(String pathName, VFSFilenameIterator itr, boolean recursive) {
-		assertThread();
 		try {
 			iterateFile(pathName, getJREFile(pathName), itr, recursive);
 		}catch(BreakLoop ex) {
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java
index 47e79bd..9dcadc8 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java
@@ -6,6 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 import org.lwjgl.PointerBuffer;
+import org.lwjgl.glfw.GLFWVidMode;
 import org.lwjgl.system.MemoryStack;
 
 /**
@@ -129,6 +130,9 @@ public class PlatformInput {
 		});
 		
 		glfwSetKeyCallback(glfwWindow, (window, key, scancode, action, mods) -> {
+			if (key == GLFW_KEY_F11 && action == GLFW_PRESS) {
+				toggleFullscreen();
+			}
 			if(glfwGetKey(glfwWindow, functionKeyModifier) == GLFW_PRESS) {
 				if(key >= GLFW_KEY_1 && key <= GLFW_KEY_9) {
 					key = key - GLFW_KEY_1 + GLFW_KEY_F1;
@@ -381,12 +385,64 @@ public class PlatformInput {
 		functionKeyModifier = KeyboardConstants.getGLFWKeyFromEagler(key);
 	}
 
+	private static boolean fullscreen = false;
+	private static int[] lastPos = new int[4];
+
 	public static void toggleFullscreen() {
-		//
+		long win = PlatformRuntime.getWindowHandle();
+		long mon = getCurrentMonitor(win);
+		GLFWVidMode mode = glfwGetVideoMode(mon);
+		if (fullscreen) {
+			glfwSetWindowMonitor(win, 0, lastPos[0], lastPos[1], lastPos[2], lastPos[3], mode.refreshRate());
+		} else {
+			int[] x = new int[1], y = new int[1];
+			glfwGetWindowPos(win, x, y);
+			lastPos[0] = x[0];
+			lastPos[1] = y[0];
+			glfwGetWindowSize(win, x, y);
+			lastPos[2] = x[0];
+			lastPos[3] = y[0];
+			glfwSetWindowMonitor(win, mon, 0, 0, mode.width(), mode.height(), mode.refreshRate());
+		}
+		fullscreen = !fullscreen;
+	}
+
+	// https://stackoverflow.com/a/31526753
+	private static long getCurrentMonitor(long window) {
+		int nmonitors, i;
+		int[] wx = new int[1], wy = new int[1], ww = new int[1], wh = new int[1];
+		int[] mx = new int[1], my = new int[1], mw = new int[1], mh = new int[1];
+		int overlap, bestoverlap = 0;
+		long bestmonitor = 0;
+		PointerBuffer monitors;
+		GLFWVidMode mode;
+
+		glfwGetWindowPos(window, wx, wy);
+		glfwGetWindowSize(window, ww, wh);
+		monitors = glfwGetMonitors();
+		nmonitors = monitors.remaining();
+
+		for (i = 0; i < nmonitors; ++i) {
+			mode = glfwGetVideoMode(monitors.get(i));
+			glfwGetMonitorPos(monitors.get(i), mx, my);
+			mw[0] = mode.width();
+			mh[0] = mode.height();
+
+			overlap =
+					Math.max(0, Math.min(wx[0] + ww[0], mx[0] + mw[0]) - Math.max(wx[0], mx[0])) *
+							Math.max(0, Math.min(wy[0] + wh[0], my[0] + mh[0]) - Math.max(wy[0], my[0]));
+
+			if (bestoverlap < overlap) {
+				bestoverlap = overlap;
+				bestmonitor = monitors.get(i);
+			}
+		}
+
+		return bestmonitor;
 	}
 
 	public static boolean isFullscreen() {
-		return false;
+		return fullscreen;
 	}
 
 	public static void showCursor(EnumCursorType cursor) {
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java
index 647aff0..70e824a 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java
@@ -10,6 +10,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -36,12 +37,14 @@ import org.lwjgl.system.MemoryUtil;
 import org.lwjgl.system.jemalloc.JEmalloc;
 
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.EaglerLWJGLAllocator;
+import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.IntBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.lwjgl.DesktopClientConfigAdapter;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerFolderResourcePack;
 
 /**
  * Copyright (c) 2022-2023 lax1dude, ayunami2000. All Rights Reserved.
@@ -71,6 +74,8 @@ public class PlatformRuntime {
 
 	public static void create() {
 		logger.info("Starting Desktop Runtime...");
+		PlatformFilesystem.initialize();
+		EaglerFolderResourcePack.setSupported(true);
 		
 		if(requestedANGLEPlatform != EnumPlatformANGLE.DEFAULT) {
 			logger.info("Setting ANGLE Platform: {}", requestedANGLEPlatform.name);
@@ -295,7 +300,31 @@ public class PlatformRuntime {
 	public static FloatBuffer allocateFloatBuffer(int length) {
 		return EaglerLWJGLAllocator.allocFloatBuffer(length);
 	}
-	
+
+	public static ByteBuffer castPrimitiveByteArray(byte[] array) {
+		return null;
+	}
+
+	public static IntBuffer castPrimitiveIntArray(int[] array) {
+		return null;
+	}
+
+	public static FloatBuffer castPrimitiveFloatArray(float[] array) {
+		return null;
+	}
+
+	public static byte[] castNativeByteBuffer(ByteBuffer buffer) {
+		return null;
+	}
+
+	public static int[] castNativeIntBuffer(IntBuffer buffer) {
+		return null;
+	}
+
+	public static float[] castNativeFloatBuffer(FloatBuffer buffer) {
+		return null;
+	}
+
 	public static void freeByteBuffer(ByteBuffer byteBuffer) {
 		EaglerLWJGLAllocator.freeByteBuffer(byteBuffer);
 	}
@@ -429,6 +458,22 @@ public class PlatformRuntime {
 		return new GZIPInputStream(is);
 	}
 	
+	public static void downloadRemoteURIByteArray(String assetPackageURI, final Consumer<byte[]> cb) {
+		logger.info("Downloading: {}");
+		try(InputStream is = (new URL(assetPackageURI)).openStream()) {
+			EaglerOutputStream bao = new EaglerOutputStream();
+			byte[] copyBuffer = new byte[16384];
+			int i;
+			while((i = is.read(copyBuffer, 0, copyBuffer.length)) != -1) {
+				bao.write(copyBuffer, 0, i);
+			}
+			cb.accept(bao.toByteArray());
+		}catch(IOException ex) {
+			logger.error("Failed to download file!");
+			logger.error(ex);
+		}
+	}
+	
 	public static boolean requireSSL() {
 		return false;
 	}
@@ -468,4 +513,8 @@ public class PlatformRuntime {
 	public static String currentThreadName() {
 		return Thread.currentThread().getName();
 	}
+
+	public static long getWindowHandle() {
+		return windowHandle;
+	}
 }
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformWebRTC.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformWebRTC.java
index 4fa250d..4e349a6 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformWebRTC.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformWebRTC.java
@@ -1,18 +1,41 @@
 package net.lax1dude.eaglercraft.v1_8.internal;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
+import dev.onvoid.webrtc.*;
+import dev.onvoid.webrtc.internal.NativeLoader;
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.EagUtils;
+import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.sp.lan.LANPeerEvent;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayManager;
 import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayQuery;
 import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayServerSocket;
 import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayWorldsQuery;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.*;
+import net.lax1dude.eaglercraft.v1_8.update.UpdateService;
+
+import org.apache.commons.lang3.SystemUtils;
+import org.java_websocket.client.WebSocketClient;
+import org.java_websocket.handshake.ServerHandshake;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.json.JSONWriter;
+
+import com.google.common.collect.LinkedListMultimap;
+import com.google.common.collect.ListMultimap;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.net.URI;
+import java.nio.ByteBuffer;
+import java.nio.file.Paths;
+import java.util.*;
 
 /**
- * Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved.
- * 
+ * Copyright (c) 2022-2024 ayunami2000. All Rights Reserved.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -23,123 +46,1556 @@ import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayWorldsQuery;
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 public class PlatformWebRTC {
 
+	private static final Logger logger = LogManager.getLogger("PlatformWebRTC");
+
+	private static final Object lock1 = new Object();
+	private static final Object lock2 = new Object();
+	private static final Object lock3 = new Object();
+	private static final Object lock4 = new Object();
+
+	public static PeerConnectionFactory pcFactory;
+
+	private static boolean supported = true;
+
 	public static boolean supported() {
-		return false;
+		if (supported && pcFactory == null) {
+			try {
+				System.load(Paths.get(SystemUtils.IS_OS_WINDOWS ? "webrtc-java.dll" : "libwebrtc-java.so").toAbsolutePath().toString());
+				Field f = NativeLoader.class.getDeclaredField("LOADED_LIB_SET");
+				f.setAccessible(true);
+				((Set<String>) f.get(null)).add("webrtc-java");
+				pcFactory = new PeerConnectionFactory();
+				Runtime.getRuntime().addShutdownHook(new Thread(() -> pcFactory.dispose()));
+				supported = true;
+			} catch (Exception e) {
+				EagRuntime.debugPrintStackTrace(e);
+				supported = false;
+			}
+		}
+		return supported;
 	}
 
-	public static RelayServerSocket openRelayConnection(String addr, int timeout) {
-		throw new UnsupportedOperationException("LAN not supported on desktop runtime!");
+	private static final Map<String, RTCDataChannel> fuckTeaVM = new HashMap<>();
+
+	public static class LANClient {
+		public static final byte READYSTATE_INIT_FAILED = -2;
+		public static final byte READYSTATE_FAILED = -1;
+		public static final byte READYSTATE_DISCONNECTED = 0;
+		public static final byte READYSTATE_CONNECTING = 1;
+		public static final byte READYSTATE_CONNECTED = 2;
+
+		public Set<Map<String, String>> iceServers = new HashSet<>();
+		public RTCPeerConnection peerConnection = null;
+		public RTCDataChannel dataChannel = null;
+
+		public byte readyState = READYSTATE_CONNECTING;
+
+		private final List<Map<String, String>> iceCandidates = new ArrayList<>();
+
+		public void initialize() {
+			try {
+				if (dataChannel != null) {
+					dataChannel.close();
+					dataChannel = null;
+				}
+				synchronized (lock1) {
+					if (peerConnection != null) {
+						peerConnection.close();
+						peerConnection = null;
+					}
+				}
+				RTCConfiguration rtcConfig = new RTCConfiguration();
+				for (Map<String, String> server : iceServers) {
+					RTCIceServer iceServer = new RTCIceServer();
+					iceServer.urls.add(server.get("urls"));
+					iceServer.username = server.getOrDefault("username", null);
+					iceServer.password = server.getOrDefault("credential", null);
+					rtcConfig.iceServers.add(iceServer);
+				}
+				synchronized (lock1) {
+					this.peerConnection = pcFactory.createPeerConnection(rtcConfig, new PeerConnectionObserver() {
+						@Override
+						public void onIceCandidate(RTCIceCandidate iceCandidate) {
+							synchronized (lock1) {
+								if (iceCandidate.sdp != null && !iceCandidate.sdp.isEmpty()) {
+									if (iceCandidates.isEmpty()) {
+										new Thread(() -> {
+											EagUtils.sleep(3000);
+											synchronized (lock1) {
+												if (peerConnection != null && peerConnection.getConnectionState() != RTCPeerConnectionState.DISCONNECTED) {
+													clientICECandidate = JSONWriter.valueToString(iceCandidates);
+													iceCandidates.clear();
+												}
+											}
+										}).start();
+									}
+									Map<String, String> m = new HashMap<>();
+									m.put("sdpMLineIndex", "" + iceCandidate.sdpMLineIndex);
+									m.put("candidate", iceCandidate.sdp);
+									iceCandidates.add(m);
+								}
+							}
+						}
+
+						@Override
+						public void onConnectionChange(RTCPeerConnectionState connectionState) {
+							if (connectionState == RTCPeerConnectionState.DISCONNECTED) {
+								signalRemoteDisconnect(false);
+							} else if (connectionState == RTCPeerConnectionState.CONNECTED) {
+								readyState = READYSTATE_CONNECTED;
+							} else if (connectionState == RTCPeerConnectionState.FAILED) {
+								readyState = READYSTATE_FAILED;
+								signalRemoteDisconnect(false);
+							}
+						}
+					});
+				}
+				this.readyState = READYSTATE_CONNECTING;
+			} catch (Throwable t) {
+				readyState = READYSTATE_INIT_FAILED;
+			}
+		}
+
+		public void setIceServers(String[] urls) {
+			iceServers.clear();
+			for (int i = 0; i < urls.length; ++i) {
+				String url = urls[i];
+				String[] etr = url.split(";");
+				if (etr.length == 1) {
+					Map<String, String> m = new HashMap<>();
+					m.put("urls", etr[0]);
+					iceServers.add(m);
+				} else if (etr.length == 3) {
+					Map<String, String> m = new HashMap<>();
+					m.put("urls", etr[0]);
+					m.put("username", etr[1]);
+					m.put("credential", etr[2]);
+					iceServers.add(m);
+				}
+			}
+		}
+
+		public void sendPacketToServer(RTCDataChannelBuffer buffer) {
+			if (dataChannel != null && dataChannel.getState() == RTCDataChannelState.OPEN) {
+				try {
+					dataChannel.send(buffer);
+				} catch (Throwable e) {
+					signalRemoteDisconnect(false);
+				}
+			} else {
+				signalRemoteDisconnect(false);
+			}
+		}
+
+		public void signalRemoteConnect() {
+			dataChannel = peerConnection.createDataChannel("lan", new RTCDataChannelInit());
+
+			dataChannel.registerObserver(new RTCDataChannelObserver() {
+				@Override
+				public void onBufferedAmountChange(long l) {
+					//
+				}
+
+				@Override
+				public void onStateChange() {
+					if (dataChannel != null && dataChannel.getState() == RTCDataChannelState.OPEN) {
+						new Thread(() -> {
+							while (true) {
+								synchronized (lock1) {
+									if (iceCandidates.isEmpty()) {
+										break;
+									}
+								}
+								EagUtils.sleep(1);
+							}
+							synchronized (lock2) {
+								clientDataChannelClosed = false;
+								clientDataChannelOpen = true;
+							}
+						}).start();
+					}
+				}
+
+				@Override
+				public void onMessage(RTCDataChannelBuffer buffer) {
+					if (!buffer.binary) return;
+					byte[] data = new byte[buffer.data.remaining()];
+					buffer.data.get(data);
+					synchronized (clientLANPacketBuffer) {
+						clientLANPacketBuffer.add(data);
+					}
+				}
+			});
+
+			peerConnection.createOffer(new RTCOfferOptions(), new CreateSessionDescriptionObserver() {
+				@Override
+				public void onSuccess(RTCSessionDescription desc) {
+					peerConnection.setLocalDescription(desc, new SetSessionDescriptionObserver() {
+						@Override
+						public void onSuccess() {
+							JSONObject descJson = new JSONObject();
+							descJson.put("type", desc.sdpType.name().toLowerCase());
+							descJson.put("sdp", desc.sdp);
+							clientDescription = descJson.toString();
+						}
+
+						@Override
+						public void onFailure(String s) {
+							logger.error("Failed to set local description! {}", s);
+							readyState = READYSTATE_FAILED;
+							signalRemoteDisconnect(false);
+						}
+					});
+				}
+
+				@Override
+				public void onFailure(String s) {
+					logger.error("Failed to set create offer! {}", s);
+					readyState = READYSTATE_FAILED;
+					signalRemoteDisconnect(false);
+				}
+			});
+		}
+
+		public void signalRemoteDescription(String json) {
+			try {
+				JSONObject jsonObject = new JSONObject(json);
+				peerConnection.setRemoteDescription(new RTCSessionDescription(RTCSdpType.valueOf(jsonObject.getString("type").toUpperCase()), jsonObject.getString("sdp")), new SetSessionDescriptionObserver() {
+					@Override
+					public void onSuccess() {
+						//
+					}
+
+					@Override
+					public void onFailure(String s) {
+						logger.error(s);
+						readyState = READYSTATE_FAILED;
+						signalRemoteDisconnect(false);
+					}
+				});
+			} catch (Throwable t) {
+				EagRuntime.debugPrintStackTrace(t);
+				readyState = READYSTATE_FAILED;
+				signalRemoteDisconnect(false);
+			}
+		}
+
+		public void signalRemoteICECandidate(String candidates) {
+			try {
+				JSONArray jsonArray = new JSONArray(candidates);
+				for (int i = 0, l = jsonArray.length(); i < l; ++i) {
+					JSONObject candidate = jsonArray.getJSONObject(i);
+					peerConnection.addIceCandidate(new RTCIceCandidate(null, candidate.getInt("sdpMLineIndex"), candidate.getString("candidate")));
+				}
+			} catch (Throwable t) {
+				EagRuntime.debugPrintStackTrace(t);
+				readyState = READYSTATE_FAILED;
+				signalRemoteDisconnect(false);
+			}
+		}
+
+		public void signalRemoteDisconnect(boolean quiet) {
+			if (dataChannel != null) {
+				dataChannel.close();
+				dataChannel = null;
+			}
+			synchronized (lock1) {
+				if (peerConnection != null) {
+					peerConnection.close();
+					peerConnection = null;
+				}
+			}
+			synchronized (lock2) {
+				if (!quiet) clientDataChannelClosed = true;
+			}
+			readyState = READYSTATE_DISCONNECTED;
+		}
+	}
+
+	public static final byte PEERSTATE_FAILED = 0;
+	public static final byte PEERSTATE_SUCCESS = 1;
+	public static final byte PEERSTATE_LOADING = 2;
+
+	public static class LANPeer {
+		public LANServer client;
+		public String peerId;
+		public RTCPeerConnection peerConnection;
+
+		public LANPeer(LANServer client, String peerId, RTCPeerConnection peerConnection) {
+			this.client = client;
+			this.peerId = peerId;
+			this.peerConnection = peerConnection;
+		}
+
+		public void disconnect() {
+			synchronized (fuckTeaVM) {
+				if (fuckTeaVM.get(peerId) != null) {
+					fuckTeaVM.remove(peerId).close();
+				}
+			}
+			peerConnection.close();
+			peerConnection = null;
+		}
+
+		public void setRemoteDescription(String descJSON) {
+			try {
+				JSONObject remoteDesc = new JSONObject(descJSON);
+				peerConnection.setRemoteDescription(new RTCSessionDescription(RTCSdpType.valueOf(remoteDesc.getString("type").toUpperCase()), remoteDesc.getString("sdp")), new SetSessionDescriptionObserver() {
+					@Override
+					public void onSuccess() {
+						if (remoteDesc.has("type") && "offer".equals(remoteDesc.getString("type"))) {
+							peerConnection.createAnswer(new RTCAnswerOptions(), new CreateSessionDescriptionObserver() {
+								@Override
+								public void onSuccess(RTCSessionDescription desc) {
+									peerConnection.setLocalDescription(desc, new SetSessionDescriptionObserver() {
+										@Override
+										public void onSuccess() {
+											JSONObject descJson = new JSONObject();
+											descJson.put("type", desc.sdpType.name().toLowerCase());
+											descJson.put("sdp", desc.sdp);
+											LANPeerEvent.LANPeerDescriptionEvent e = new LANPeerEvent.LANPeerDescriptionEvent(peerId, descJson.toString());
+											synchronized (serverLANEventBuffer) {
+												serverLANEventBuffer.put(peerId, e);
+											}
+											if (client.peerStateDesc != PEERSTATE_SUCCESS)
+												client.peerStateDesc = PEERSTATE_SUCCESS;
+										}
+
+										@Override
+										public void onFailure(String s) {
+											logger.error("Failed to set local description for \"{}\"! {}", peerId, s);
+											if (client.peerStateDesc == PEERSTATE_LOADING)
+												client.peerStateDesc = PEERSTATE_FAILED;
+											client.signalRemoteDisconnect(peerId);
+										}
+									});
+								}
+
+								@Override
+								public void onFailure(String s) {
+									logger.error("Failed to create answer for \"{}\"! {}", peerId, s);
+									if (client.peerStateDesc == PEERSTATE_LOADING)
+										client.peerStateDesc = PEERSTATE_FAILED;
+									client.signalRemoteDisconnect(peerId);
+								}
+							});
+						}
+					}
+
+					@Override
+					public void onFailure(String s) {
+						logger.error("Failed to set remote description for \"{}\"! {}", peerId, s);
+						if (client.peerStateDesc == PEERSTATE_LOADING) client.peerStateDesc = PEERSTATE_FAILED;
+						client.signalRemoteDisconnect(peerId);
+					}
+				});
+			} catch (Throwable err) {
+				logger.error("Failed to parse remote description for \"{}\"! {}", peerId, err.getMessage());
+				if (client.peerStateDesc == PEERSTATE_LOADING) client.peerStateDesc = PEERSTATE_FAILED;
+				client.signalRemoteDisconnect(peerId);
+			}
+		}
+
+		public void addICECandidate(String candidates) {
+			try {
+				JSONArray jsonArray = new JSONArray(candidates);
+				for (int i = 0, l = jsonArray.length(); i < l; ++i) {
+					JSONObject candidate = jsonArray.getJSONObject(i);
+					peerConnection.addIceCandidate(new RTCIceCandidate(null, candidate.getInt("sdpMLineIndex"), candidate.getString("candidate")));
+				}
+				if (client.peerStateIce != PEERSTATE_SUCCESS) client.peerStateIce = PEERSTATE_SUCCESS;
+			} catch (Throwable err) {
+				logger.error("Failed to parse ice candidate for \"{}\"! {}", peerId, err.getMessage());
+				if (client.peerStateIce == PEERSTATE_LOADING) client.peerStateIce = PEERSTATE_FAILED;
+				client.signalRemoteDisconnect(peerId);
+			}
+		}
+	}
+
+	public static class LANServer {
+		public Set<Map<String, String>> iceServers = new HashSet<>();
+		public Map<String, LANPeer> peerList = new HashMap<>();
+		public byte peerState = PEERSTATE_LOADING;
+		public byte peerStateConnect = PEERSTATE_LOADING;
+		public byte peerStateInitial = PEERSTATE_LOADING;
+		public byte peerStateDesc = PEERSTATE_LOADING;
+		public byte peerStateIce = PEERSTATE_LOADING;
+
+		public void setIceServers(String[] urls) {
+			iceServers.clear();
+			for (int i = 0; i < urls.length; ++i) {
+				String[] etr = urls[i].split(";");
+				if (etr.length == 1) {
+					Map<String, String> m = new HashMap<>();
+					m.put("urls", etr[0]);
+					iceServers.add(m);
+				} else if (etr.length == 3) {
+					Map<String, String> m = new HashMap<>();
+					m.put("urls", etr[0]);
+					m.put("username", etr[1]);
+					m.put("credential", etr[2]);
+					iceServers.add(m);
+				}
+			}
+		}
+
+		public void sendPacketToRemoteClient(String peerId, RTCDataChannelBuffer buffer) {
+			LANPeer thePeer = this.peerList.get(peerId);
+			if (thePeer != null) {
+				boolean b = false;
+				synchronized (fuckTeaVM) {
+					if (fuckTeaVM.get(thePeer.peerId) != null && fuckTeaVM.get(thePeer.peerId).getState() == RTCDataChannelState.OPEN) {
+						try {
+							fuckTeaVM.get(thePeer.peerId).send(buffer);
+						} catch (Throwable e) {
+							b = true;
+						}
+					} else {
+						b = true;
+					}
+				}
+				if (b) {
+					signalRemoteDisconnect(peerId);
+				}
+			}
+		}
+
+		public void resetPeerStates() {
+			peerState = peerStateConnect = peerStateInitial = peerStateDesc = peerStateIce = PEERSTATE_LOADING;
+		}
+
+		public void signalRemoteConnect(String peerId) {
+			try {
+				List<Map<String, String>> iceCandidates = new ArrayList<>();
+				RTCConfiguration rtcConfig = new RTCConfiguration();
+				for (Map<String, String> server : iceServers) {
+					RTCIceServer iceServer = new RTCIceServer();
+					iceServer.urls.add(server.get("urls"));
+					iceServer.username = server.getOrDefault("username", null);
+					iceServer.password = server.getOrDefault("credential", null);
+					rtcConfig.iceServers.add(iceServer);
+				}
+				RTCPeerConnection[] peerConnection = new RTCPeerConnection[1];
+				peerConnection[0] = pcFactory.createPeerConnection(rtcConfig, new PeerConnectionObserver() {
+					@Override
+					public void onIceCandidate(RTCIceCandidate iceCandidate) {
+						synchronized (lock3) {
+							if (iceCandidate.sdp != null && !iceCandidate.sdp.isEmpty()) {
+								if (iceCandidates.isEmpty()) {
+									new Thread(() -> {
+										EagUtils.sleep(3000);
+										synchronized (lock3) {
+											if (peerConnection[0] != null && peerConnection[0].getConnectionState() != RTCPeerConnectionState.DISCONNECTED) {
+												LANPeerEvent.LANPeerICECandidateEvent e = new LANPeerEvent.LANPeerICECandidateEvent(peerId, JSONWriter.valueToString(iceCandidates));
+												synchronized (serverLANEventBuffer) {
+													serverLANEventBuffer.put(peerId, e);
+												}
+												iceCandidates.clear();
+											}
+										}
+									}).start();
+								}
+								Map<String, String> m = new HashMap<>();
+								m.put("sdpMLineIndex", "" + iceCandidate.sdpMLineIndex);
+								m.put("candidate", iceCandidate.sdp);
+								iceCandidates.add(m);
+							}
+						}
+					}
+
+					@Override
+					public void onDataChannel(RTCDataChannel dataChannel) {
+						new Thread(() -> {
+							while (true) {
+								synchronized (lock3) {
+									if (iceCandidates.isEmpty()) {
+										break;
+									}
+								}
+								EagUtils.sleep(1);
+							}
+							if (dataChannel == null) return;
+							synchronized (fuckTeaVM) {
+								fuckTeaVM.put(peerId, dataChannel);
+							}
+							synchronized (serverLANEventBuffer) {
+								serverLANEventBuffer.put(peerId, new LANPeerEvent.LANPeerDataChannelEvent(peerId));
+							}
+							dataChannel.registerObserver(new RTCDataChannelObserver() {
+								@Override
+								public void onBufferedAmountChange(long l) {
+									//
+								}
+
+								@Override
+								public void onStateChange() {
+									//
+								}
+
+								@Override
+								public void onMessage(RTCDataChannelBuffer buffer) {
+									if (!buffer.binary) return;
+									byte[] data = new byte[buffer.data.remaining()];
+									buffer.data.get(data);
+									LANPeerEvent.LANPeerPacketEvent e = new LANPeerEvent.LANPeerPacketEvent(peerId, data);
+									synchronized (serverLANEventBuffer) {
+										serverLANEventBuffer.put(peerId, e);
+									}
+								}
+							});
+						}).start();
+					}
+
+					@Override
+					public void onConnectionChange(RTCPeerConnectionState connectionState) {
+						if (connectionState == RTCPeerConnectionState.DISCONNECTED) {
+							LANServer.this.signalRemoteDisconnect(peerId);
+						} else if (connectionState == RTCPeerConnectionState.CONNECTED) {
+							if (LANServer.this.peerState != PEERSTATE_SUCCESS)
+								LANServer.this.peerState = PEERSTATE_SUCCESS;
+						} else if (connectionState == RTCPeerConnectionState.FAILED) {
+							if (LANServer.this.peerState == PEERSTATE_LOADING)
+								LANServer.this.peerState = PEERSTATE_FAILED;
+							LANServer.this.signalRemoteDisconnect(peerId);
+						}
+					}
+				});
+				LANPeer peerInstance = new LANPeer(this, peerId, peerConnection[0]);
+				peerList.put(peerId, peerInstance);
+				if (peerStateConnect != PEERSTATE_SUCCESS) peerStateConnect = PEERSTATE_SUCCESS;
+			} catch (Throwable e) {
+				if (peerStateConnect == PEERSTATE_LOADING) peerStateConnect = PEERSTATE_FAILED;
+			}
+		}
+
+		public void signalRemoteDescription(String peerId, String descJSON) {
+			LANPeer thePeer = peerList.get(peerId);
+			if (thePeer != null) {
+				thePeer.setRemoteDescription(descJSON);
+			}
+		}
+
+		public void signalRemoteICECandidate(String peerId, String candidate) {
+			LANPeer thePeer = peerList.get(peerId);
+			if (thePeer != null) {
+				thePeer.addICECandidate(candidate);
+			}
+		}
+
+		public void signalRemoteDisconnect(String peerId) {
+			if (peerId == null || peerId.isEmpty()) {
+				for (LANPeer thePeer : peerList.values()) {
+					if (thePeer != null) {
+						try {
+							thePeer.disconnect();
+						} catch (Throwable ignored) {
+						}
+						synchronized (serverLANEventBuffer) {
+							serverLANEventBuffer.put(thePeer.peerId, new LANPeerEvent.LANPeerDisconnectEvent(thePeer.peerId));
+						}
+					}
+				}
+				peerList.clear();
+				synchronized (fuckTeaVM) {
+					fuckTeaVM.clear();
+				}
+				return;
+			}
+			LANPeer thePeer = peerList.get(peerId);
+			if (thePeer != null) {
+				peerList.remove(peerId);
+				try {
+					thePeer.disconnect();
+				} catch (Throwable ignored) {
+				}
+				synchronized (fuckTeaVM) {
+					fuckTeaVM.remove(peerId);
+				}
+				synchronized (serverLANEventBuffer) {
+					serverLANEventBuffer.put(thePeer.peerId, new LANPeerEvent.LANPeerDisconnectEvent(peerId));
+				}
+			}
+		}
+
+		public int countPeers() {
+			return peerList.size();
+		}
+	}
+
+	private static final Map<String,Long> relayQueryLimited = new HashMap<>();
+	private static final Map<String,Long> relayQueryBlocked = new HashMap<>();
+
+	private static class RelayQueryImpl implements RelayQuery {
+
+		private final WebSocketClient sock;
+		private final String uri;
+
+		private boolean open;
+		private boolean failed;
+
+		private boolean hasRecievedAnyData = false;
+
+		private int vers = -1;
+		private String comment = "<no comment>";
+		private String brand = "<no brand>";
+
+		private long connectionOpenedAt;
+		private long connectionPingStart = -1;
+		private long connectionPingTimer = -1;
+
+		private RateLimit rateLimitStatus = RateLimit.NONE;
+
+		private VersionMismatch versError = VersionMismatch.UNKNOWN;
+
+		private RelayQueryImpl(String uri) {
+			this.uri = uri;
+			WebSocketClient s;
+			try {
+				connectionOpenedAt = System.currentTimeMillis();
+				s = new WebSocketClient(new URI(uri)) {
+					@Override
+					public void onOpen(ServerHandshake serverHandshake) {
+						try {
+							connectionPingStart = System.currentTimeMillis();
+							sock.send(IPacket.writePacket(new IPacket00Handshake(0x03, RelayManager.preferredRelayVersion, "")));
+						} catch (IOException e) {
+							logger.error(e.toString());
+							sock.close();
+							failed = true;
+						}
+					}
+
+					@Override
+					public void onMessage(String s) {
+						//
+					}
+
+					@Override
+					public void onMessage(ByteBuffer bb) {
+						if(bb != null) {
+							hasRecievedAnyData = true;
+							byte[] arr = new byte[bb.remaining()];
+							bb.get(arr);
+							if(arr.length == 2 && arr[0] == (byte)0xFC) {
+								long millis = System.currentTimeMillis();
+								if(arr[1] == (byte)0x00 || arr[1] == (byte)0x01) {
+									rateLimitStatus = RateLimit.BLOCKED;
+									relayQueryLimited.put(RelayQueryImpl.this.uri, millis);
+								}else if(arr[1] == (byte)0x02) {
+									rateLimitStatus = RateLimit.NOW_LOCKED;
+									relayQueryLimited.put(RelayQueryImpl.this.uri, millis);
+									relayQueryBlocked.put(RelayQueryImpl.this.uri, millis);
+								}else {
+									rateLimitStatus = RateLimit.LOCKED;
+									relayQueryBlocked.put(RelayQueryImpl.this.uri, millis);
+								}
+								failed = true;
+								open = false;
+								sock.close();
+							}else {
+								if(open) {
+									try {
+										IPacket pkt = IPacket.readPacket(new DataInputStream(new EaglerInputStream(arr)));
+										if(pkt instanceof IPacket69Pong) {
+											IPacket69Pong ipkt = (IPacket69Pong)pkt;
+											versError = VersionMismatch.COMPATIBLE;
+											if(connectionPingTimer == -1) {
+												connectionPingTimer = System.currentTimeMillis() - connectionPingStart;
+											}
+											vers = ipkt.protcolVersion;
+											comment = ipkt.comment;
+											brand = ipkt.brand;
+											open = false;
+											failed = false;
+											sock.close();
+										}else if(pkt instanceof IPacket70SpecialUpdate) {
+											IPacket70SpecialUpdate ipkt = (IPacket70SpecialUpdate)pkt;
+											if(ipkt.operation == IPacket70SpecialUpdate.OPERATION_UPDATE_CERTIFICATE) {
+												UpdateService.addCertificateToSet(ipkt.updatePacket);
+											}
+										}else if(pkt instanceof IPacketFFErrorCode) {
+											IPacketFFErrorCode ipkt = (IPacketFFErrorCode)pkt;
+											if(ipkt.code == IPacketFFErrorCode.TYPE_PROTOCOL_VERSION) {
+												String s1 = ipkt.desc.toLowerCase();
+												if(s1.contains("outdated client") || s1.contains("client outdated")) {
+													versError = VersionMismatch.CLIENT_OUTDATED;
+												}else if(s1.contains("outdated server") || s1.contains("server outdated") ||
+														s1.contains("outdated relay") || s1.contains("server relay")) {
+													versError = VersionMismatch.RELAY_OUTDATED;
+												}else {
+													versError = VersionMismatch.UNKNOWN;
+												}
+											}
+											logger.error("{}\": Recieved query error code {}: {}", uri, ipkt.code, ipkt.desc);
+											open = false;
+											failed = true;
+											sock.close();
+										}else {
+											throw new IOException("Unexpected packet '" + pkt.getClass().getSimpleName() + "'");
+										}
+									} catch (IOException e) {
+										logger.error("Relay Query Error: {}", e.toString());
+										EagRuntime.debugPrintStackTrace(e);
+										open = false;
+										failed = true;
+										sock.close();
+									}
+								}
+							}
+						}
+					}
+
+					@Override
+					public void onClose(int i, String s, boolean b) {
+						open = false;
+						if(!hasRecievedAnyData) {
+							failed = true;
+							Long l = relayQueryBlocked.get(uri);
+							if(l != null) {
+								if(System.currentTimeMillis() - l.longValue() < 400000l) {
+									rateLimitStatus = RateLimit.LOCKED;
+									return;
+								}
+							}
+							l = relayQueryLimited.get(uri);
+							if(l != null) {
+								if(System.currentTimeMillis() - l.longValue() < 900000l) {
+									rateLimitStatus = RateLimit.BLOCKED;
+									return;
+								}
+							}
+						}
+					}
+
+					@Override
+					public void onError(Exception e) {
+						EagRuntime.debugPrintStackTrace(e);
+					}
+				};
+				s.connect();
+				open = true;
+				failed = false;
+			}catch(Throwable t) {
+				connectionOpenedAt = 0l;
+				sock = null;
+				open = false;
+				failed = true;
+				return;
+			}
+			sock = s;
+		}
+
+		@Override
+		public boolean isQueryOpen() {
+			return open;
+		}
+
+		@Override
+		public boolean isQueryFailed() {
+			return failed;
+		}
+
+		@Override
+		public RateLimit isQueryRateLimit() {
+			return rateLimitStatus;
+		}
+
+		@Override
+		public void close() {
+			if(sock != null && open) {
+				sock.close();
+			}
+			open = false;
+		}
+
+		@Override
+		public int getVersion() {
+			return vers;
+		}
+
+		@Override
+		public String getComment() {
+			return comment;
+		}
+
+		@Override
+		public String getBrand() {
+			return brand;
+		}
+
+		@Override
+		public long getPing() {
+			return connectionPingTimer < 1 ? 1 : connectionPingTimer;
+		}
+
+		@Override
+		public VersionMismatch getCompatible() {
+			return versError;
+		}
+
+	}
+
+	private static class RelayQueryRatelimitDummy implements RelayQuery {
+
+		private final RateLimit type;
+
+		private RelayQueryRatelimitDummy(RateLimit type) {
+			this.type = type;
+		}
+
+		@Override
+		public boolean isQueryOpen() {
+			return false;
+		}
+
+		@Override
+		public boolean isQueryFailed() {
+			return true;
+		}
+
+		@Override
+		public RateLimit isQueryRateLimit() {
+			return type;
+		}
+
+		@Override
+		public void close() {
+		}
+
+		@Override
+		public int getVersion() {
+			return RelayManager.preferredRelayVersion;
+		}
+
+		@Override
+		public String getComment() {
+			return "this query was rate limited";
+		}
+
+		@Override
+		public String getBrand() {
+			return "lax1dude";
+		}
+
+		@Override
+		public long getPing() {
+			return 0l;
+		}
+
+		@Override
+		public VersionMismatch getCompatible() {
+			return VersionMismatch.COMPATIBLE;
+		}
+
 	}
 
 	public static RelayQuery openRelayQuery(String addr) {
-		throw new UnsupportedOperationException("LAN not supported on desktop runtime!");
+		long millis = System.currentTimeMillis();
+
+		Long l = relayQueryBlocked.get(addr);
+		if(l != null && millis - l.longValue() < 60000l) {
+			return new RelayQueryRatelimitDummy(RelayQuery.RateLimit.LOCKED);
+		}
+
+		l = relayQueryLimited.get(addr);
+		if(l != null && millis - l.longValue() < 10000l) {
+			return new RelayQueryRatelimitDummy(RelayQuery.RateLimit.BLOCKED);
+		}
+
+		return new RelayQueryImpl(addr);
+	}
+
+	private static class RelayWorldsQueryImpl implements RelayWorldsQuery {
+
+		private final WebSocketClient sock;
+		private final String uri;
+
+		private boolean open;
+		private boolean failed;
+
+		private boolean hasRecievedAnyData = false;
+		private RelayQuery.RateLimit rateLimitStatus = RelayQuery.RateLimit.NONE;
+
+		private RelayQuery.VersionMismatch versError = RelayQuery.VersionMismatch.UNKNOWN;
+
+		private List<IPacket07LocalWorlds.LocalWorld> worlds = null;
+
+		private RelayWorldsQueryImpl(String uri) {
+			this.uri = uri;
+			WebSocketClient s;
+			try {
+				s = new WebSocketClient(new URI(uri)) {
+					@Override
+					public void onOpen(ServerHandshake serverHandshake) {
+						try {
+							sock.send(IPacket.writePacket(new IPacket00Handshake(0x04, RelayManager.preferredRelayVersion, "")));
+						} catch (IOException e) {
+							logger.error(e.toString());
+							sock.close();
+							open = false;
+							failed = true;
+						}
+					}
+
+					@Override
+					public void onMessage(String s) {
+						//
+					}
+
+					@Override
+					public void onMessage(ByteBuffer bb) {
+						if(bb != null) {
+							hasRecievedAnyData = true;
+							byte[] arr = new byte[bb.remaining()];
+							bb.get(arr);
+							if(arr.length == 2 && arr[0] == (byte)0xFC) {
+								long millis = System.currentTimeMillis();
+								if(arr[1] == (byte)0x00 || arr[1] == (byte)0x01) {
+									rateLimitStatus = RelayQuery.RateLimit.BLOCKED;
+									relayQueryLimited.put(RelayWorldsQueryImpl.this.uri, millis);
+								}else if(arr[1] == (byte)0x02) {
+									rateLimitStatus = RelayQuery.RateLimit.NOW_LOCKED;
+									relayQueryLimited.put(RelayWorldsQueryImpl.this.uri, millis);
+									relayQueryBlocked.put(RelayWorldsQueryImpl.this.uri, millis);
+								}else {
+									rateLimitStatus = RelayQuery.RateLimit.LOCKED;
+									relayQueryBlocked.put(RelayWorldsQueryImpl.this.uri, millis);
+								}
+								open = false;
+								failed = true;
+								sock.close();
+							}else {
+								if(open) {
+									try {
+										IPacket pkt = IPacket.readPacket(new DataInputStream(new EaglerInputStream(arr)));
+										if(pkt instanceof IPacket07LocalWorlds) {
+											worlds = ((IPacket07LocalWorlds)pkt).worldsList;
+											sock.close();
+											open = false;
+											failed = false;
+										}else if(pkt instanceof IPacket70SpecialUpdate) {
+											IPacket70SpecialUpdate ipkt = (IPacket70SpecialUpdate)pkt;
+											if(ipkt.operation == IPacket70SpecialUpdate.OPERATION_UPDATE_CERTIFICATE) {
+												UpdateService.addCertificateToSet(ipkt.updatePacket);
+											}
+										}else if(pkt instanceof IPacketFFErrorCode) {
+											IPacketFFErrorCode ipkt = (IPacketFFErrorCode)pkt;
+											if(ipkt.code == IPacketFFErrorCode.TYPE_PROTOCOL_VERSION) {
+												String s1 = ipkt.desc.toLowerCase();
+												if(s1.contains("outdated client") || s1.contains("client outdated")) {
+													versError = RelayQuery.VersionMismatch.CLIENT_OUTDATED;
+												}else if(s1.contains("outdated server") || s1.contains("server outdated") ||
+														s1.contains("outdated relay") || s1.contains("server relay")) {
+													versError = RelayQuery.VersionMismatch.RELAY_OUTDATED;
+												}else {
+													versError = RelayQuery.VersionMismatch.UNKNOWN;
+												}
+											}
+											logger.error("{}: Recieved query error code {}: {}", uri, ipkt.code, ipkt.desc);
+											open = false;
+											failed = true;
+											sock.close();
+										}else {
+											throw new IOException("Unexpected packet '" + pkt.getClass().getSimpleName() + "'");
+										}
+									} catch (IOException e) {
+										logger.error("Relay World Query Error: {}", e.toString());
+										EagRuntime.debugPrintStackTrace(e);
+										open = false;
+										failed = true;
+										sock.close();
+									}
+								}
+							}
+						}
+					}
+
+					@Override
+					public void onClose(int i, String s, boolean b) {
+						open = false;
+						if(!hasRecievedAnyData) {
+							failed = true;
+							Long l = relayQueryBlocked.get(uri);
+							if(l != null) {
+								if(System.currentTimeMillis() - l.longValue() < 400000l) {
+									rateLimitStatus = RelayQuery.RateLimit.LOCKED;
+									return;
+								}
+							}
+							l = relayQueryLimited.get(uri);
+							if(l != null) {
+								if(System.currentTimeMillis() - l.longValue() < 900000l) {
+									rateLimitStatus = RelayQuery.RateLimit.BLOCKED;
+									return;
+								}
+							}
+						}
+					}
+
+					@Override
+					public void onError(Exception e) {
+						EagRuntime.debugPrintStackTrace(e);
+					}
+				};
+				s.connect();
+				open = true;
+				failed = false;
+			}catch(Throwable t) {
+				sock = null;
+				open = false;
+				failed = true;
+				return;
+			}
+			sock = s;
+		}
+
+		@Override
+		public boolean isQueryOpen() {
+			return open;
+		}
+
+		@Override
+		public boolean isQueryFailed() {
+			return failed;
+		}
+
+		@Override
+		public RelayQuery.RateLimit isQueryRateLimit() {
+			return rateLimitStatus;
+		}
+
+		@Override
+		public void close() {
+			if(open && sock != null) {
+				sock.close();
+			}
+			open = false;
+		}
+
+		@Override
+		public List<IPacket07LocalWorlds.LocalWorld> getWorlds() {
+			return worlds;
+		}
+
+		@Override
+		public RelayQuery.VersionMismatch getCompatible() {
+			return versError;
+		}
+
+	}
+
+	private static class RelayWorldsQueryRatelimitDummy implements RelayWorldsQuery {
+
+		private final RelayQuery.RateLimit rateLimit;
+
+		private RelayWorldsQueryRatelimitDummy(RelayQuery.RateLimit rateLimit) {
+			this.rateLimit = rateLimit;
+		}
+
+		@Override
+		public boolean isQueryOpen() {
+			return false;
+		}
+
+		@Override
+		public boolean isQueryFailed() {
+			return true;
+		}
+
+		@Override
+		public RelayQuery.RateLimit isQueryRateLimit() {
+			return rateLimit;
+		}
+
+		@Override
+		public void close() {
+		}
+
+		@Override
+		public List<IPacket07LocalWorlds.LocalWorld> getWorlds() {
+			return new ArrayList(0);
+		}
+
+		@Override
+		public RelayQuery.VersionMismatch getCompatible() {
+			return RelayQuery.VersionMismatch.COMPATIBLE;
+		}
 	}
 
 	public static RelayWorldsQuery openRelayWorldsQuery(String addr) {
-		throw new UnsupportedOperationException("LAN not supported on desktop runtime!");
+		long millis = System.currentTimeMillis();
+
+		Long l = relayQueryBlocked.get(addr);
+		if(l != null && millis - l.longValue() < 60000l) {
+			return new RelayWorldsQueryRatelimitDummy(RelayQuery.RateLimit.LOCKED);
+		}
+
+		l = relayQueryLimited.get(addr);
+		if(l != null && millis - l.longValue() < 10000l) {
+			return new RelayWorldsQueryRatelimitDummy(RelayQuery.RateLimit.BLOCKED);
+		}
+
+		return new RelayWorldsQueryImpl(addr);
 	}
 
+	private static class RelayServerSocketImpl implements RelayServerSocket {
+
+		private final WebSocketClient sock;
+		private final String uri;
+
+		private boolean open;
+		private boolean closed;
+		private boolean failed;
+
+		private boolean hasRecievedAnyData;
+
+		private final List<Throwable> exceptions = new LinkedList();
+		private final List<IPacket> packets = new LinkedList();
+
+		private RelayServerSocketImpl(String uri, int timeout) {
+			this.uri = uri;
+			WebSocketClient s;
+			try {
+				s = new WebSocketClient(new URI(uri)) {
+					@Override
+					public void onOpen(ServerHandshake serverHandshake) {
+						synchronized (lock4) {
+							open = true;
+						}
+					}
+
+					@Override
+					public void onMessage(String s) {
+						//
+					}
+
+					@Override
+					public void onMessage(ByteBuffer bb) {
+						if(bb != null) {
+							hasRecievedAnyData = true;
+							try {
+								byte[] arr = new byte[bb.remaining()];
+								bb.get(arr);
+								IPacket pkt = IPacket.readPacket(new DataInputStream(new EaglerInputStream(arr)));
+								if(pkt instanceof IPacket70SpecialUpdate) {
+									IPacket70SpecialUpdate ipkt = (IPacket70SpecialUpdate)pkt;
+									if(ipkt.operation == IPacket70SpecialUpdate.OPERATION_UPDATE_CERTIFICATE) {
+										UpdateService.addCertificateToSet(ipkt.updatePacket);
+									}
+								}else {
+									packets.add(pkt);
+								}
+							} catch (IOException e) {
+								exceptions.add(e);
+								logger.error("Relay Socket Error: {}", e.toString());
+								EagRuntime.debugPrintStackTrace(e);
+								synchronized (lock4) {
+									open = false;
+									failed = true;
+								}
+								closed = true;
+								synchronized (lock4) {
+									sock.close();
+								}
+							}
+						}
+					}
+
+					@Override
+					public void onClose(int i, String s, boolean b) {
+						if (!hasRecievedAnyData) {
+							failed = true;
+						}
+						synchronized (lock4) {
+							open = false;
+							closed = true;
+						}
+					}
+
+					@Override
+					public void onError(Exception e) {
+						EagRuntime.debugPrintStackTrace(e);
+					}
+				};
+				s.connect();
+				synchronized (lock4) {
+					open = false;
+					closed = false;
+				}
+				failed = false;
+			}catch(Throwable t) {
+				exceptions.add(t);
+				synchronized (lock4) {
+					sock = null;
+					open = false;
+					closed = true;
+				}
+				failed = true;
+				return;
+			}
+			synchronized (lock4) {
+				sock = s;
+			}
+			new Thread(() -> {
+				EagUtils.sleep(timeout);
+				synchronized (lock4) {
+					if (!open && !closed) {
+						closed = true;
+						sock.close();
+					}
+				}
+			}).start();
+		}
+
+		@Override
+		public boolean isOpen() {
+			return open;
+		}
+
+		@Override
+		public boolean isClosed() {
+			synchronized (lock4) {
+				return closed;
+			}
+		}
+
+		@Override
+		public void close() {
+			if(open && sock != null) {
+				synchronized (lock4) {
+					sock.close();
+				}
+			}
+			synchronized (lock4) {
+				open = false;
+				closed = true;
+			}
+		}
+
+		@Override
+		public boolean isFailed() {
+			return failed;
+		}
+
+		@Override
+		public Throwable getException() {
+			if(!exceptions.isEmpty()) {
+				return exceptions.remove(0);
+			}else {
+				return null;
+			}
+		}
+
+		@Override
+		public void writePacket(IPacket pkt) {
+			try {
+				sock.send(IPacket.writePacket(pkt));
+			} catch (Throwable e) {
+				logger.error("Relay connection error: {}", e.toString());
+				EagRuntime.debugPrintStackTrace(e);
+				exceptions.add(e);
+				failed = true;
+				synchronized (lock4) {
+					open = false;
+					closed = true;
+					sock.close();
+				}
+			}
+		}
+
+		@Override
+		public IPacket readPacket() {
+			if(!packets.isEmpty()) {
+				return packets.remove(0);
+			}else {
+				return null;
+			}
+		}
+
+		@Override
+		public IPacket nextPacket() {
+			if(!packets.isEmpty()) {
+				return packets.get(0);
+			}else {
+				return null;
+			}
+		}
+
+		@Override
+		public RelayQuery.RateLimit getRatelimitHistory() {
+			if(relayQueryBlocked.containsKey(uri)) {
+				return RelayQuery.RateLimit.LOCKED;
+			}
+			if(relayQueryLimited.containsKey(uri)) {
+				return RelayQuery.RateLimit.BLOCKED;
+			}
+			return RelayQuery.RateLimit.NONE;
+		}
+
+		@Override
+		public String getURI() {
+			return uri;
+		}
+
+	}
+
+	private static class RelayServerSocketRatelimitDummy implements RelayServerSocket {
+
+		private final RelayQuery.RateLimit limit;
+
+		private RelayServerSocketRatelimitDummy(RelayQuery.RateLimit limit) {
+			this.limit = limit;
+		}
+
+		@Override
+		public boolean isOpen() {
+			return false;
+		}
+
+		@Override
+		public boolean isClosed() {
+			return true;
+		}
+
+		@Override
+		public void close() {
+		}
+
+		@Override
+		public boolean isFailed() {
+			return true;
+		}
+
+		@Override
+		public Throwable getException() {
+			return null;
+		}
+
+		@Override
+		public void writePacket(IPacket pkt) {
+		}
+
+		@Override
+		public IPacket readPacket() {
+			return null;
+		}
+
+		@Override
+		public IPacket nextPacket() {
+			return null;
+		}
+
+		@Override
+		public RelayQuery.RateLimit getRatelimitHistory() {
+			return limit;
+		}
+
+		@Override
+		public String getURI() {
+			return "<disconnected>";
+		}
+
+	}
+
+	public static RelayServerSocket openRelayConnection(String addr, int timeout) {
+		long millis = System.currentTimeMillis();
+
+		Long l = relayQueryBlocked.get(addr);
+		if(l != null && millis - l.longValue() < 60000l) {
+			return new RelayServerSocketRatelimitDummy(RelayQuery.RateLimit.LOCKED);
+		}
+
+		l = relayQueryLimited.get(addr);
+		if(l != null && millis - l.longValue() < 10000l) {
+			return new RelayServerSocketRatelimitDummy(RelayQuery.RateLimit.BLOCKED);
+		}
+
+		return new RelayServerSocketImpl(addr, timeout);
+	}
+
+	private static LANClient rtcLANClient = null;
+
 	public static void startRTCLANClient() {
-		throw new UnsupportedOperationException("LAN not supported on desktop runtime!");
+		if (rtcLANClient == null) {
+			rtcLANClient = new LANClient();
+		}
 	}
 
+	private static final List<byte[]> clientLANPacketBuffer = new ArrayList<>();
+
+	private static String clientICECandidate = null;
+	private static String clientDescription = null;
+	private static boolean clientDataChannelOpen = false;
+	private static boolean clientDataChannelClosed = true;
+
 	public static int clientLANReadyState() {
-		return 0;
+		return rtcLANClient.readyState;
 	}
 
 	public static void clientLANCloseConnection() {
-		throw new UnsupportedOperationException("LAN not supported on desktop runtime!");
+		rtcLANClient.signalRemoteDisconnect(false);
 	}
 
 	public static void clientLANSendPacket(byte[] pkt) {
-		throw new UnsupportedOperationException("LAN not supported on desktop runtime!");
+		rtcLANClient.sendPacketToServer(new RTCDataChannelBuffer(ByteBuffer.wrap(pkt), true));
 	}
 
 	public static byte[] clientLANReadPacket() {
-		throw new UnsupportedOperationException("LAN not supported on desktop runtime!");
+		synchronized(clientLANPacketBuffer) {
+			return !clientLANPacketBuffer.isEmpty() ? clientLANPacketBuffer.remove(0) : null;
+		}
 	}
 
 	public static List<byte[]> clientLANReadAllPacket() {
-		throw new UnsupportedOperationException("LAN not supported on desktop runtime!");
+		synchronized(clientLANPacketBuffer) {
+			if(!clientLANPacketBuffer.isEmpty()) {
+				List<byte[]> ret = new ArrayList(clientLANPacketBuffer);
+				clientLANPacketBuffer.clear();
+				return ret;
+			}else {
+				return null;
+			}
+		}
 	}
 
 	public static void clientLANSetICEServersAndConnect(String[] servers) {
-		throw new UnsupportedOperationException("LAN not supported on desktop runtime!");
+		rtcLANClient.setIceServers(servers);
+		if(clientLANReadyState() == LANClient.READYSTATE_CONNECTED || clientLANReadyState() == LANClient.READYSTATE_CONNECTING) {
+			rtcLANClient.signalRemoteDisconnect(true);
+		}
+		rtcLANClient.initialize();
+		rtcLANClient.signalRemoteConnect();
 	}
 
 	public static void clearLANClientState() {
-		throw new UnsupportedOperationException("LAN not supported on desktop runtime!");
+		clientICECandidate = null;
+		clientDescription = null;
+		synchronized (lock2) {
+			clientDataChannelOpen = false;
+			clientDataChannelClosed = true;
+		}
 	}
 
 	public static String clientLANAwaitICECandidate() {
-		throw new UnsupportedOperationException("LAN not supported on desktop runtime!");
+		if(clientICECandidate != null) {
+			String ret = clientICECandidate;
+			clientICECandidate = null;
+			return ret;
+		}else {
+			return null;
+		}
 	}
 
 	public static String clientLANAwaitDescription() {
-		throw new UnsupportedOperationException("LAN not supported on desktop runtime!");
+		if(clientDescription != null) {
+			String ret = clientDescription;
+			clientDescription = null;
+			return ret;
+		}else {
+			return null;
+		}
 	}
 
 	public static boolean clientLANAwaitChannel() {
-		throw new UnsupportedOperationException("LAN not supported on desktop runtime!");
+		synchronized (lock2) {
+			if (clientDataChannelOpen) {
+				clientDataChannelOpen = false;
+				return true;
+			} else {
+				return false;
+			}
+		}
 	}
 
 	public static boolean clientLANClosed() {
-		return true;
+		synchronized (lock2) {
+			return clientDataChannelClosed;
+		}
 	}
 
 	public static void clientLANSetICECandidate(String candidate) {
-		throw new UnsupportedOperationException("LAN not supported on desktop runtime!");
+		rtcLANClient.signalRemoteICECandidate(candidate);
 	}
 
 	public static void clientLANSetDescription(String description) {
-		throw new UnsupportedOperationException("LAN not supported on desktop runtime!");
+		rtcLANClient.signalRemoteDescription(description);
 	}
 
+	private static LANServer rtcLANServer = null;
+
 	public static void startRTCLANServer() {
-		throw new UnsupportedOperationException("LAN not supported on desktop runtime!");
+		if (rtcLANServer == null) {
+			rtcLANServer = new LANServer();
+		}
 	}
 
+	private static final ListMultimap<String, LANPeerEvent> serverLANEventBuffer = LinkedListMultimap.create();
+
 	public static void serverLANInitializeServer(String[] servers) {
-		throw new UnsupportedOperationException("LAN not supported on desktop runtime!");
+		synchronized(serverLANEventBuffer) {
+			serverLANEventBuffer.clear();
+		}
+		rtcLANServer.resetPeerStates();
+		rtcLANServer.setIceServers(servers);
 	}
 
 	public static void serverLANCloseServer() {
-		throw new UnsupportedOperationException("LAN not supported on desktop runtime!");
+		rtcLANServer.signalRemoteDisconnect("");
 	}
 
 	public static LANPeerEvent serverLANGetEvent(String clientId) {
-		throw new UnsupportedOperationException("LAN not supported on desktop runtime!");
+		synchronized(serverLANEventBuffer) {
+			if(!serverLANEventBuffer.isEmpty()) {
+				List<LANPeerEvent> l = serverLANEventBuffer.get(clientId);
+				if(!l.isEmpty()) {
+					return l.remove(0);
+				}
+			}
+			return null;
+		}
 	}
 
 	public static List<LANPeerEvent> serverLANGetAllEvent(String clientId) {
-		throw new UnsupportedOperationException("LAN not supported on desktop runtime!");
+		synchronized(serverLANEventBuffer) {
+			if(!serverLANEventBuffer.isEmpty()) {
+				List<LANPeerEvent> l = serverLANEventBuffer.removeAll(clientId);
+				if(l.isEmpty()) {
+					return null;
+				}
+				return l;
+			}
+			return null;
+		}
 	}
 
 	public static void serverLANWritePacket(String peer, byte[] data) {
-		throw new UnsupportedOperationException("LAN not supported on desktop runtime!");
+		rtcLANServer.sendPacketToRemoteClient(peer, new RTCDataChannelBuffer(ByteBuffer.wrap(data), true));
 	}
 
 	public static void serverLANCreatePeer(String peer) {
-		throw new UnsupportedOperationException("LAN not supported on desktop runtime!");
+		rtcLANServer.signalRemoteConnect(peer);
 	}
 
 	public static void serverLANPeerICECandidates(String peer, String iceCandidates) {
-		throw new UnsupportedOperationException("LAN not supported on desktop runtime!");
+		rtcLANServer.signalRemoteICECandidate(peer, iceCandidates);
 	}
 
 	public static void serverLANPeerDescription(String peer, String description) {
-		throw new UnsupportedOperationException("LAN not supported on desktop runtime!");
+		rtcLANServer.signalRemoteDescription(peer, description);
 	}
 
 	public static void serverLANDisconnectPeer(String peer) {
-		throw new UnsupportedOperationException("LAN not supported on desktop runtime!");
+		rtcLANServer.signalRemoteDisconnect(peer);
 	}
 
 	public static int countPeers() {
-		return 0;
+		if (rtcLANServer == null) {
+			return 0;
+		}
+		return rtcLANServer.countPeers();
 	}
-}
+}
\ No newline at end of file
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/DesktopClientConfigAdapter.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/DesktopClientConfigAdapter.java
index 32f6db1..01cf405 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/DesktopClientConfigAdapter.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/DesktopClientConfigAdapter.java
@@ -5,6 +5,7 @@ import java.util.List;
 
 import org.json.JSONObject;
 
+import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion;
 import net.lax1dude.eaglercraft.v1_8.internal.IClientConfigAdapter;
 import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayEntry;
@@ -50,18 +51,31 @@ public class DesktopClientConfigAdapter implements IClientConfigAdapter {
 		return "desktop";
 	}
 
+	@Override
+	public String getResourcePacksDB() {
+		return "desktop";
+	}
+
 	@Override
 	public JSONObject dumpConfig() {
 		return new JSONObject("{\"container\":null,\"worldsDB\":\"desktop\"}");
 	}
 
+	private final List<RelayEntry> relays = new ArrayList<>();
+
 	@Override
 	public List<RelayEntry> getRelays() {
-		throw new UnsupportedOperationException("TODO");
+		if (relays.isEmpty()) {
+			int relayId = (new EaglercraftRandom()).nextInt(3);
+			relays.add(new RelayEntry("wss://relay.deev.is/", "lax1dude relay #1", relayId == 0));
+			relays.add(new RelayEntry("wss://relay.lax1dude.net/", "lax1dude relay #2", relayId == 1));
+			relays.add(new RelayEntry("wss://relay.shhnowisnottheti.me/", "ayunami relay #1", relayId == 2));
+		}
+		return relays;
 	}
 
 	@Override
-	public boolean checkShaderGLErrors() {
+	public boolean isCheckShaderGLErrors() {
 		return true;
 	}
 
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/LWJGLEntryPoint.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/LWJGLEntryPoint.java
index decc506..6ce3858 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/LWJGLEntryPoint.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/LWJGLEntryPoint.java
@@ -8,6 +8,7 @@ import net.lax1dude.eaglercraft.v1_8.EagUtils;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumPlatformANGLE;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.program.ShaderSource;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayManager;
 import net.minecraft.client.main.Main;
 
 /**
@@ -57,6 +58,13 @@ public class LWJGLEntryPoint {
 			}
 		}
 		
+		RelayManager.relayManager.load(EagRuntime.getStorage("r"));
+
+		if (RelayManager.relayManager.count() <= 0) {
+			RelayManager.relayManager.loadDefaults();
+			RelayManager.relayManager.save();
+		}
+		
 		EagRuntime.create();
 		
 		Main.appMain(new String[0]);
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/MainMenuCreditsDialog.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/MainMenuCreditsDialog.java
new file mode 100755
index 0000000..8f19e5b
--- /dev/null
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/MainMenuCreditsDialog.java
@@ -0,0 +1,76 @@
+package net.lax1dude.eaglercraft.v1_8.internal.lwjgl;
+
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.border.EmptyBorder;
+import java.awt.BorderLayout;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import java.awt.Font;
+import java.awt.GraphicsEnvironment;
+import java.awt.Toolkit;
+import javax.swing.ScrollPaneConstants;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class MainMenuCreditsDialog extends JFrame {
+
+	private static final long serialVersionUID = 696969696L;
+	private JPanel contentPane;
+	private JTextArea textArea;
+
+	/**
+	 * Create the frame.
+	 */
+	public MainMenuCreditsDialog() {
+		setIconImage(Toolkit.getDefaultToolkit().getImage("icon32.png"));
+		setTitle("EaglercraftX 1.8 Credits");
+		setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
+		setBounds(100, 100, 850, 700);
+		setLocationByPlatform(true);
+		setAlwaysOnTop(true);
+		contentPane = new JPanel();
+
+		setContentPane(contentPane);
+		contentPane.setLayout(new BorderLayout(0, 0));
+		
+		JScrollPane scrollPane = new JScrollPane();
+		scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
+		contentPane.add(scrollPane, BorderLayout.CENTER);
+		
+		textArea = new JTextArea();
+		textArea.setEditable(false);
+		textArea.setLineWrap(true);
+		textArea.setWrapStyleWord(true);
+		String[] fonts = GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
+		Font daFont = null;
+		for(int i = 0; i < fonts.length; ++i) {
+			if(fonts[i].equalsIgnoreCase("consolas")) {
+				daFont = new Font(fonts[i], Font.PLAIN, 15);
+				break;
+			}
+		}
+		if(daFont == null) {
+			daFont = new Font(Font.MONOSPACED, Font.PLAIN, 15);
+		}
+		textArea.setFont(daFont);
+		scrollPane.setViewportView(textArea);
+	}
+
+	public void setCreditsText(String str) {
+		textArea.setText(str);
+	}
+}
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/FolderResourcePack.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/FolderResourcePack.java
deleted file mode 100755
index 6302459..0000000
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/FolderResourcePack.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package net.lax1dude.eaglercraft.v1_8.internal.vfs;
-
-import com.google.common.collect.Sets;
-import net.minecraft.client.resources.AbstractResourcePack;
-
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.Set;
-
-/**
- * Copyright (c) 2022-2023 lax1dude, ayunami2000. All Rights Reserved.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- */
-public class FolderResourcePack extends AbstractResourcePack {
-	public FolderResourcePack(String resourcePackFileIn, String prefix) {
-		super(resourcePackFileIn);
-	}
-
-	protected InputStream getInputStreamByName(String name) {
-		return new BufferedInputStream(new ByteArrayInputStream(new byte[0]));
-	}
-
-	protected boolean hasResourceName(String name) {
-		return false;
-	}
-
-	public Set<String> getResourceDomains() {
-		return Sets.<String>newHashSet();
-	}
-}
\ No newline at end of file
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/SYS.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/SYS.java
deleted file mode 100755
index 7de45b1..0000000
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/SYS.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package net.lax1dude.eaglercraft.v1_8.internal.vfs;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Consumer;
-
-/**
- * Copyright (c) 2022-2023 lax1dude, ayunami2000. All Rights Reserved.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- */
-public class SYS {
-
-	public static final Object VFS = null;
-
-	public static final void loadRemoteResourcePack(String url, String hash, Consumer<String> cb, Consumer<Runnable> ast, Runnable loading) {
-		return;
-	}
-
-	public static final boolean loadResourcePack(String name, InputStream data, String hash) {
-		return false;
-	}
-
-	public static final List<String> getResourcePackNames() {
-		return new ArrayList<>();
-	}
-
-	public static final void deleteResourcePack(String packName) {
-		//
-	}
-}
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/sp/internal/ClientPlatformSingleplayer.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/sp/internal/ClientPlatformSingleplayer.java
index c5487ee..2a7c736 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/sp/internal/ClientPlatformSingleplayer.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/sp/internal/ClientPlatformSingleplayer.java
@@ -3,7 +3,6 @@ package net.lax1dude.eaglercraft.v1_8.sp.internal;
 import java.util.ArrayList;
 import java.util.List;
 
-import net.lax1dude.eaglercraft.v1_8.internal.IClientConfigAdapter;
 import net.lax1dude.eaglercraft.v1_8.internal.IPCPacketData;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
 import net.lax1dude.eaglercraft.v1_8.sp.server.internal.lwjgl.CrashScreenPopup;
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/lwjgl/CrashScreenPopup.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/lwjgl/CrashScreenPopup.java
index 0f83f6f..74f4307 100755
--- a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/lwjgl/CrashScreenPopup.java
+++ b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/lwjgl/CrashScreenPopup.java
@@ -9,7 +9,6 @@ import javax.swing.ScrollPaneConstants;
 import java.awt.Font;
 import java.awt.Toolkit;
 import java.awt.Color;
-import java.awt.Window.Type;
 
 /**
  * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
diff --git a/src/main/java/com/google/common/base/Charsets.java b/src/main/java/com/google/common/base/Charsets.java
index 8e11739..c0ed99b 100755
--- a/src/main/java/com/google/common/base/Charsets.java
+++ b/src/main/java/com/google/common/base/Charsets.java
@@ -19,7 +19,6 @@ package com.google.common.base;
 import java.nio.charset.Charset;
 
 import com.google.common.annotations.GwtCompatible;
-import com.google.common.annotations.GwtIncompatible;
 
 /**
  * Contains constant definitions for the six standard {@link Charset} instances,
diff --git a/src/main/java/com/google/common/base/Throwables.java b/src/main/java/com/google/common/base/Throwables.java
index b4e7a8f..c113198 100755
--- a/src/main/java/com/google/common/base/Throwables.java
+++ b/src/main/java/com/google/common/base/Throwables.java
@@ -18,8 +18,6 @@ package com.google.common.base;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
diff --git a/src/main/java/com/google/common/collect/Lists.java b/src/main/java/com/google/common/collect/Lists.java
index 7207a5b..df3a2a9 100755
--- a/src/main/java/com/google/common/collect/Lists.java
+++ b/src/main/java/com/google/common/collect/Lists.java
@@ -44,7 +44,6 @@ import javax.annotation.Nullable;
 
 import com.google.common.annotations.Beta;
 import com.google.common.annotations.GwtCompatible;
-import com.google.common.annotations.GwtIncompatible;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
 import com.google.common.base.Objects;
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/ArrayUtils.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/ArrayUtils.java
index eb52a4a..06f2564 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/ArrayUtils.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/ArrayUtils.java
@@ -55,6 +55,17 @@ public class ArrayUtils {
 		}
 		return str;
 	}
+	
+	private static final String hex = "0123456789abcdef";
+	
+	public static String hexString(byte[] bytesIn) {
+		char[] ret = new char[bytesIn.length << 1];
+		for(int i = 0; i < bytesIn.length; ++i) {
+			ret[i << 1] = hex.charAt((bytesIn[i] >> 4) & 15);
+			ret[(i << 1) + 1] = hex.charAt(bytesIn[i] & 15);
+		}
+		return new String(ret);
+	}
 
 	public static <T> void eaglerShuffle(List<T> list, EaglercraftRandom rnd) {
 		T k;
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/BaseNCodec.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/BaseNCodec.java
index 79ead56..846d3bb 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/BaseNCodec.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/BaseNCodec.java
@@ -390,7 +390,8 @@ public abstract class BaseNCodec {
 		if (arrayOctet == null) {
 			return false;
 		}
-		for (final byte element : arrayOctet) {
+		for (int i = 0; i < arrayOctet.length; ++i) {
+			byte element = arrayOctet[i];
 			if (pad == element || isInAlphabet(element)) {
 				return true;
 			}
@@ -624,7 +625,8 @@ public abstract class BaseNCodec {
 	 *         the byte array is empty; {@code false}, otherwise
 	 */
 	public boolean isInAlphabet(final byte[] arrayOctet, final boolean allowWSPad) {
-		for (final byte octet : arrayOctet) {
+		for (int i = 0; i < arrayOctet.length; ++i) {
+			byte octet = arrayOctet[i];
 			if (!isInAlphabet(octet) && (!allowWSPad || (octet != pad) && !isWhiteSpace(octet))) {
 				return false;
 			}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/EagRuntime.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/EagRuntime.java
index 557c5c8..5e95b8a 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/EagRuntime.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/EagRuntime.java
@@ -14,6 +14,7 @@ import java.util.Calendar;
 import java.util.List;
 import java.util.function.Consumer;
 
+import net.lax1dude.eaglercraft.v1_8.internal.EnumPlatformANGLE;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumPlatformAgent;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumPlatformOS;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumPlatformType;
@@ -28,7 +29,7 @@ import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
 import net.lax1dude.eaglercraft.v1_8.update.UpdateService;
 
 /**
- * Copyright (c) 2022-2023 lax1dude, ayunami2000. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -48,6 +49,10 @@ public class EagRuntime {
 	private static final Logger exceptionLogger = LogManager.getLogger("Exception");
 	private static boolean ssl = false;
 	private static boolean offlineDownloadURL = false;
+	private static EnumPlatformAgent userAgent = null;
+	private static String userAgentString = null;
+	private static EnumPlatformOS operatingSystem = null;
+	private static EnumPlatformANGLE angleBackend = null;
 	
 	public static String getVersion() {
 		return "EagRuntimeX 1.0";
@@ -58,6 +63,10 @@ public class EagRuntime {
 		PlatformRuntime.create();
 		ssl = PlatformRuntime.requireSSL();
 		offlineDownloadURL = PlatformRuntime.isOfflineDownloadURL();
+		userAgent = PlatformRuntime.getPlatformAgent();
+		userAgentString = PlatformRuntime.getUserAgentString();
+		operatingSystem = PlatformRuntime.getPlatformOS();
+		angleBackend = PlatformRuntime.getPlatformANGLE();
 		UpdateService.initialize();
 		EaglerXBungeeVersion.initialize();
 		EaglercraftGPU.warmUpCache();
@@ -72,15 +81,19 @@ public class EagRuntime {
 	}
 
 	public static EnumPlatformAgent getPlatformAgent() {
-		return PlatformRuntime.getPlatformAgent();
+		return userAgent;
 	}
-	
+
 	public static String getUserAgentString() {
-		return PlatformRuntime.getUserAgentString();
+		return userAgentString;
 	}
 
 	public static EnumPlatformOS getPlatformOS() {
-		return PlatformRuntime.getPlatformOS();
+		return operatingSystem;
+	}
+
+	public static EnumPlatformANGLE getPlatformANGLE() {
+		return angleBackend;
 	}
 
 	public static ByteBuffer allocateByteBuffer(int length) {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglerInputStream.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglerInputStream.java
index b7d363c..7c0f50f 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglerInputStream.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglerInputStream.java
@@ -1,12 +1,13 @@
 package net.lax1dude.eaglercraft.v1_8;
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Arrays;
 
 /**
- * Copyright (c) 2022 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -20,39 +21,117 @@ import java.io.InputStream;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-public class EaglerInputStream extends ByteArrayInputStream {
+public class EaglerInputStream extends InputStream {
+
+	protected byte buf[];
+	protected int pos;
+	protected int mark = 0;
+	protected int count;
 
 	public EaglerInputStream(byte[] buf) {
-		super(buf);
+		this.buf = buf;
+		this.pos = 0;
+		this.count = buf.length;
 	}
 
-	public EaglerInputStream(byte[] buf, int off, int len) {
-		super(buf, off, len);
+	public EaglerInputStream(byte buf[], int offset, int length) {
+		this.buf = buf;
+		this.pos = offset;
+		this.count = Math.min(offset + length, buf.length);
+		this.mark = offset;
 	}
-	
+
+	public int read() {
+		return (pos < count) ? (buf[pos++] & 0xff) : -1;
+	}
+
+	public int read(byte b[], int off, int len) {
+		if (pos >= count) {
+			return -1;
+		}
+
+		int avail = count - pos;
+		if (len > avail) {
+			len = avail;
+		}
+		if (len <= 0) {
+			return 0;
+		}
+		System.arraycopy(buf, pos, b, off, len);
+		pos += len;
+		return len;
+	}
+
+	public byte[] readAllBytes() {
+		byte[] result = Arrays.copyOfRange(buf, pos, count);
+		pos = count;
+		return result;
+	}
+
+	public int readNBytes(byte[] b, int off, int len) {
+		int n = read(b, off, len);
+		return n == -1 ? 0 : n;
+	}
+
+	public long transferTo(OutputStream out) throws IOException {
+		int len = count - pos;
+		out.write(buf, pos, len);
+		pos = count;
+		return len;
+	}
+
 	public static byte[] inputStreamToBytesQuiet(InputStream is) {
-		if(is == null) {
+		if (is == null) {
 			return null;
 		}
 		try {
 			return inputStreamToBytes(is);
-		}catch(IOException ex) {
+		} catch (IOException ex) {
 			return null;
 		}
 	}
-	
+
+	public long skip(long n) {
+		long k = count - pos;
+		if (n < k) {
+			k = n < 0 ? 0 : n;
+		}
+
+		pos += k;
+		return k;
+	}
+
+	public int available() {
+		return count - pos;
+	}
+
+	public boolean markSupported() {
+		return true;
+	}
+
+	public void mark(int readAheadLimit) {
+		mark = pos;
+	}
+
+	public void reset() {
+		pos = mark;
+	}
+
+	public void close() throws IOException {
+	}
+
 	public static byte[] inputStreamToBytes(InputStream is) throws IOException {
-		if(is instanceof EaglerInputStream) {
+		if (is instanceof EaglerInputStream) {
 			return ((EaglerInputStream) is).getAsArray();
-		}else if(is instanceof ByteArrayInputStream) {
+		} else if (is instanceof ByteArrayInputStream) {
 			byte[] ret = new byte[is.available()];
 			is.read(ret);
 			return ret;
-		}else {
-			ByteArrayOutputStream os = new ByteArrayOutputStream(1024);
+		} else {
+			EaglerOutputStream os = new EaglerOutputStream(1024);
 			byte[] buf = new byte[1024];
 			int i;
-			while((i = is.read(buf)) != -1) {
+			while ((i = is.read(buf)) != -1) {
 				os.write(buf, 0, i);
 			}
 			return os.toByteArray();
@@ -60,27 +139,27 @@ public class EaglerInputStream extends ByteArrayInputStream {
 	}
 
 	public byte[] getAsArray() {
-		if(pos == 0 && count == buf.length) {
+		if (pos == 0 && count == buf.length) {
 			return buf;
-		}else {
+		} else {
 			byte[] ret = new byte[count];
 			System.arraycopy(buf, pos, ret, 0, count);
 			return ret;
 		}
 	}
-	
+
 	public boolean canUseArrayDirectly() {
 		return pos == 0 && count == buf.length;
 	}
-	
+
 	public int getPosition() {
 		return pos;
 	}
-	
+
 	public int getMark() {
 		return mark;
 	}
-	
+
 	public int getCount() {
 		return count;
 	}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglerOutputStream.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglerOutputStream.java
new file mode 100755
index 0000000..46dc77b
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglerOutputStream.java
@@ -0,0 +1,79 @@
+package net.lax1dude.eaglercraft.v1_8;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Arrays;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class EaglerOutputStream extends OutputStream {
+
+	protected byte buf[];
+	protected int count;
+
+	public EaglerOutputStream() {
+		this(32);
+	}
+
+	public EaglerOutputStream(int size) {
+		if (size < 0) {
+			throw new IllegalArgumentException("Negative initial size: " + size);
+		}
+		buf = new byte[size];
+	}
+
+	private void ensureCapacity(int minCapacity) {
+		if (buf.length < minCapacity) {
+			minCapacity = Math.max(minCapacity, buf.length * 3 / 2);
+			buf = Arrays.copyOf(buf, minCapacity);
+		}
+	}
+
+	public void write(int b) {
+		ensureCapacity(count + 1);
+		buf[count] = (byte) b;
+		count += 1;
+	}
+
+	public void write(byte b[], int off, int len) {
+		ensureCapacity(count + len);
+		System.arraycopy(b, off, buf, count, len);
+		count += len;
+	}
+
+	public void writeBytes(byte b[]) {
+		write(b, 0, b.length);
+	}
+
+	public void writeTo(OutputStream out) throws IOException {
+		out.write(buf, 0, count);
+	}
+
+	public void reset() {
+		count = 0;
+	}
+
+	public byte[] toByteArray() {
+		return Arrays.copyOf(buf, count);
+	}
+
+	public int size() {
+		return count;
+	}
+
+	public void close() throws IOException {
+	}
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java
index bcf3e61..4a4b000 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java
@@ -10,7 +10,7 @@ public class EaglercraftVersion {
 	/// Customize these to fit your fork:
 	
 	public static final String projectForkName = "EaglercraftX";
-	public static final String projectForkVersion = "u23";
+	public static final String projectForkVersion = "u24";
 	public static final String projectForkVendor = "lax1dude";
 	
 	public static final String projectForkURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8";
@@ -20,7 +20,7 @@ public class EaglercraftVersion {
 	public static final String projectOriginName = "EaglercraftX";
 	public static final String projectOriginAuthor = "lax1dude";
 	public static final String projectOriginRevision = "1.8";
-	public static final String projectOriginVersion = "u23";
+	public static final String projectOriginVersion = "u24";
 	
 	public static final String projectOriginURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8"; // rest in peace
 	
@@ -31,7 +31,7 @@ public class EaglercraftVersion {
 	public static final boolean enableUpdateService = true;
 
 	public static final String updateBundlePackageName = "net.lax1dude.eaglercraft.v1_8.client";
-	public static final int updateBundlePackageVersionInt = 23;
+	public static final int updateBundlePackageVersionInt = 24;
 
 	public static final String updateLatestLocalStorageKey = "latestUpdate_" + updateBundlePackageName;
 
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/IOUtils.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/IOUtils.java
index f107c8c..d9a2fb4 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/IOUtils.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/IOUtils.java
@@ -71,4 +71,19 @@ public class IOUtils {
 		}
 	}
 
+	public static int readFully(InputStream is, byte[] out) throws IOException {
+		int i = 0, j;
+		while(i < out.length && (j = is.read(out, i, out.length - i)) != -1) {
+			i += j;
+		}
+		return i;
+	}
+
+	public static long skipFully(InputStream is, long skip) throws IOException {
+		long i = 0, j;
+		while(i < skip && (j = is.skip(skip - i)) != 0) {
+			i += j;
+		}
+		return i;
+	}
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/futures/ListenableFutureTask.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/futures/ListenableFutureTask.java
index 9f6710c..6ec9887 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/futures/ListenableFutureTask.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/futures/ListenableFutureTask.java
@@ -41,7 +41,8 @@ public class ListenableFutureTask<V> extends FutureTask<V> implements Listenable
 	}
 	
 	protected void done() {
-		for(Runnable r : listeners) {
+		for(int i = 0, l = listeners.size(); i < l; ++i) {
+			Runnable r = listeners.get(i);
 			try {
 				r.run();
 			}catch(Throwable t) {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IClientConfigAdapter.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IClientConfigAdapter.java
index fdb5993..f134138 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IClientConfigAdapter.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/IClientConfigAdapter.java
@@ -42,11 +42,13 @@ public interface IClientConfigAdapter {
 
 	String getWorldsDB();
 
+	String getResourcePacksDB();
+
 	JSONObject dumpConfig();
 
 	List<RelayEntry> getRelays();
 
-	boolean checkShaderGLErrors();
+	boolean isCheckShaderGLErrors();
 
 	boolean isDemo();
 
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFile2.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFile2.java
index fa69548..8ba45c8 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFile2.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFile2.java
@@ -188,8 +188,12 @@ public class VFile2 {
 			return null;
 		}
 		ByteBuffer readBuffer = PlatformFilesystem.eaglerRead(path);
+		byte[] copyBuffer = PlatformRuntime.castNativeByteBuffer(readBuffer);
+		if(copyBuffer != null) {
+			return copyBuffer;
+		}
 		try {
-			byte[] copyBuffer = new byte[readBuffer.remaining()];
+			copyBuffer = new byte[readBuffer.remaining()];
 			readBuffer.get(copyBuffer);
 			return copyBuffer;
 		}finally {
@@ -219,7 +223,12 @@ public class VFile2 {
 	
 	public void setAllBytes(byte[] bytes) {
 		assertNotRelative();
-		ByteBuffer copyBuffer = PlatformRuntime.allocateByteBuffer(bytes.length);
+		ByteBuffer copyBuffer = PlatformRuntime.castPrimitiveByteArray(bytes);
+		if(copyBuffer != null) {
+			PlatformFilesystem.eaglerWrite(path, copyBuffer);
+			return;
+		}
+		copyBuffer = PlatformRuntime.allocateByteBuffer(bytes.length);
 		try {
 			copyBuffer.put(bytes);
 			copyBuffer.flip();
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFileInputStream.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFileInputStream.java
index 5167bcb..19de2ae 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFileInputStream.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFileInputStream.java
@@ -54,7 +54,7 @@ class VFileInputStream extends InputStream {
 		if(len > 0) {
 			fileBuffer.get(b, off, len);
 		}
-		return len;
+		return len <= 0 ? -1 : len;
 	}
 
 	@Override
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFileOutputStream.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFileOutputStream.java
index 028523a..3ec26fd 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFileOutputStream.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/internal/vfs2/VFileOutputStream.java
@@ -1,8 +1,8 @@
 package net.lax1dude.eaglercraft.v1_8.internal.vfs2;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
+import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformFilesystem;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
@@ -22,7 +22,7 @@ import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-class VFileOutputStream extends ByteArrayOutputStream {
+class VFileOutputStream extends EaglerOutputStream {
 
 	private final VFile2 vfsFile;
 	private boolean closed = false;
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/ChunkUpdateManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/ChunkUpdateManager.java
index fc605d0..f20cae7 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/ChunkUpdateManager.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/ChunkUpdateManager.java
@@ -73,7 +73,9 @@ public class ChunkUpdateManager {
 
 		final CompiledChunk compiledchunk = generator.getCompiledChunk();
 		if (chunkcompiletaskgenerator$type == ChunkCompileTaskGenerator.Type.REBUILD_CHUNK) {
-			for (EnumWorldBlockLayer enumworldblocklayer : EnumWorldBlockLayer.values()) {
+			EnumWorldBlockLayer[] en = EnumWorldBlockLayer._VALUES;
+			for (int i = 0; i < en.length; ++i) {
+				EnumWorldBlockLayer enumworldblocklayer = en[i];
 				if (!compiledchunk.isLayerEmpty(enumworldblocklayer)) {
 					this.uploadChunk(enumworldblocklayer,
 							generator.getRegionRenderCacheBuilder().getWorldRendererByLayer(enumworldblocklayer),
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/EaglerFolderResourcePack.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/EaglerFolderResourcePack.java
new file mode 100755
index 0000000..c1920ad
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/EaglerFolderResourcePack.java
@@ -0,0 +1,355 @@
+package net.lax1dude.eaglercraft.v1_8.minecraft;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+
+import net.lax1dude.eaglercraft.v1_8.ArrayUtils;
+import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
+import net.lax1dude.eaglercraft.v1_8.crypto.SHA1Digest;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
+import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.minecraft.client.resources.AbstractResourcePack;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class EaglerFolderResourcePack extends AbstractResourcePack {
+
+	public static final Logger logger = LogManager.getLogger("EaglerFolderResourcePack");
+
+	public static final String SERVER_RESOURCE_PACKS = "srp";
+	public static final String RESOURCE_PACKS = "resourcepacks";
+
+	private final String prefix;
+	private final String displayName;
+	private final Set<String> domains;
+	private final long timestamp;
+
+	private static boolean isSupported = false;
+
+	public static void setSupported(boolean supported) {
+		isSupported = supported;
+	}
+
+	public static boolean isSupported() {
+		return isSupported;
+	}
+
+	public EaglerFolderResourcePack(String resourcePackFileIn, String displayName, String prefix, Set<String> domains, long timestamp) {
+		super(resourcePackFileIn);
+		this.displayName = displayName;
+		this.prefix = prefix;
+		this.domains = domains;
+		this.timestamp = timestamp;
+	}
+
+	@Override
+	public Set<String> getResourceDomains() {
+		return domains;
+	}
+
+	@Override
+	protected InputStream getInputStreamByName(String var1) throws IOException {
+		return (new VFile2(prefix, this.resourcePackFile, var1)).getInputStream();
+	}
+
+	@Override
+	protected boolean hasResourceName(String var1) {
+		return (new VFile2(prefix, this.resourcePackFile, var1)).exists();
+	}
+
+	public long getTimestamp() {
+		return timestamp;
+	}
+
+	public String getDisplayName() {
+		return displayName;
+	}
+
+	public static List<EaglerFolderResourcePack> getFolderResourcePacks(String prefix) {
+		if(!isSupported) {
+			return Collections.emptyList();
+		}
+		String str = (new VFile2(prefix, "manifest.json")).getAllChars();
+		if(str == null) {
+			return Collections.emptyList();
+		}
+		try {
+			JSONArray json = (new JSONObject(str)).getJSONArray("resourcePacks");
+			List<EaglerFolderResourcePack> ret = new ArrayList(json.length());
+			for(int i = 0, l = json.length(); i < l; ++i) {
+				JSONObject jp = json.getJSONObject(i);
+				String folderName = jp.getString("folder");
+				String displayName = jp.optString("name", folderName);
+				long timestamp = jp.getLong("timestamp");
+				Set<String> domains = Sets.newHashSet();
+				JSONArray jsonDomains = jp.getJSONArray("domains");
+				for(int j = 0, k = jsonDomains.length(); j < k; ++j) {
+					domains.add(jsonDomains.getString(j));
+				}
+				ret.add(new EaglerFolderResourcePack(folderName, displayName, prefix, domains, timestamp));
+			}
+			return ret;
+		}catch(JSONException ex) {
+			logger.error("Failed to load resource pack manifest!");
+			logger.error(ex);
+			return Collections.emptyList();
+		}
+	}
+
+	public static EaglerFolderResourcePack importResourcePack(String name, String prefix, byte[] file) throws IOException {
+		if(!isSupported) {
+			return null;
+		}
+		logger.info("Importing resource pack: {}", name);
+		int idx = name.lastIndexOf('.');
+		if(idx != -1) {
+			name = name.substring(0, idx);
+		}
+		String folderName = name.replaceAll("[^A-Za-z0-9\\-_ \\(\\)]", "_");
+		
+		final List<EaglerFolderResourcePack> existingLst = getFolderResourcePacks(RESOURCE_PACKS);
+		
+		vigg: for(;;) {
+			for(int i = 0, l = existingLst.size(); i < l; ++i) {
+				EaglerFolderResourcePack rp = existingLst.get(i);
+				if(rp.resourcePackFile.equalsIgnoreCase(folderName)) {
+					folderName = folderName + "-";
+					continue vigg;
+				}
+			}
+			break;
+		}
+		
+		List<String> fileNames = Lists.newArrayList();
+		
+		logger.info("Counting files...");
+		ZipInputStream ziss = new ZipInputStream(new EaglerInputStream(file));
+		ZipEntry zipEntry;
+		while ((zipEntry = ziss.getNextEntry()) != null) {
+			if (!zipEntry.isDirectory()) {
+				fileNames.add(zipEntry.getName());
+			}
+		}
+		
+		int prefixLen = Integer.MAX_VALUE;
+		for(int i = 0, l = fileNames.size(); i < l; ++i) {
+			String fn = fileNames.get(i);
+			if(fn.equals("pack.mcmeta") || fn.endsWith("/pack.mcmeta")) {
+				int currPrefixLen = fn.length() - 11;
+				if (prefixLen > currPrefixLen) {
+					prefixLen = currPrefixLen;
+				}
+			}
+		}
+		if (prefixLen == Integer.MAX_VALUE) {
+			prefixLen = 0;
+		}
+		
+		Set<String> domainsList = Sets.newHashSet();
+		String fn;
+		for(int i = 0, l = fileNames.size(); i < l; ++i) {
+			fn = fileNames.get(i);
+			if(fn.length() > prefixLen + 7) {
+				fn = fn.substring(prefixLen + 7);
+				int j = fn.indexOf('/');
+				if(j != -1) {
+					domainsList.add(fn.substring(0, j));
+				}
+			}
+		}
+		
+		VFile2 dstDir = new VFile2(prefix, folderName);
+		logger.info("Extracting to: {}", dstDir.getPath());
+		
+		try {
+			int totalSize = 0;
+			int totalFiles = 0;
+			int lastProg = 0;
+			ziss = new ZipInputStream(new EaglerInputStream(file));
+			while ((zipEntry = ziss.getNextEntry()) != null) {
+				if (!zipEntry.isDirectory()) {
+					fn = zipEntry.getName();
+					if(fn.length() > prefixLen) {
+						byte[] buffer = new byte[(int)zipEntry.getSize()];
+						int i = 0, j;
+						while(i < buffer.length && (j = ziss.read(buffer, i, buffer.length - i)) != -1) {
+							i += j;
+						}
+						(new VFile2(prefix, folderName, fn.substring(prefixLen))).setAllBytes(buffer);
+						totalSize += buffer.length;
+						++totalFiles;
+						if(totalSize - lastProg > 25000) {
+							lastProg = totalSize;
+							logger.info("Extracted {} files, {} bytes from ZIP file...", totalFiles, totalSize);
+						}
+					}
+				}
+			}
+		}catch(IOException ex) {
+			logger.error("Encountered an error extracting zip file, deleting extracted files...");
+			for(int i = 0, l = fileNames.size(); i < l; ++i) {
+				fn = fileNames.get(i);
+				if(fn.length() > prefixLen) {
+					(new VFile2(dstDir, fn.substring(prefixLen))).delete();
+				}
+			}
+			throw ex;
+		}
+		
+		logger.info("Updating manifest...");
+		
+		VFile2 manifestFile = new VFile2(prefix, "manifest.json");
+		String str = manifestFile.getAllChars();
+		JSONArray arr = null;
+		if(str != null) {
+			try {
+				arr = (new JSONObject(str)).getJSONArray("resourcePacks");
+			}catch(JSONException ex) {
+			}
+		}
+		
+		if(arr == null) {
+			arr = new JSONArray();
+		}
+		
+		JSONObject manifestEntry = new JSONObject();
+		manifestEntry.put("folder", folderName);
+		manifestEntry.put("name", name);
+		long timestamp = System.currentTimeMillis();
+		manifestEntry.put("timestamp", timestamp);
+		JSONArray domainsListJson = new JSONArray();
+		for(String str2 : domainsList) {
+			domainsListJson.put(str2);
+		}
+		manifestEntry.put("domains", domainsListJson);
+		arr.put(manifestEntry);
+		
+		manifestFile.setAllChars((new JSONObject()).put("resourcePacks", arr).toString());
+		
+		logger.info("Done!");
+		return new EaglerFolderResourcePack(folderName, name, prefix, domainsList, timestamp);
+	}
+
+	public static void loadRemoteResourcePack(String url, String hash, Consumer<EaglerFolderResourcePack> cb, Consumer<Runnable> ast, Runnable loading) {
+		if (!isSupported || !hash.matches("^[a-f0-9]{40}$")) {
+			cb.accept(null);
+			return;
+		}
+		final List<EaglerFolderResourcePack> lst = getFolderResourcePacks(SERVER_RESOURCE_PACKS);
+		for(int i = 0, l = lst.size(); i < l; ++i) {
+			EaglerFolderResourcePack rp = lst.get(i);
+			if(rp.resourcePackFile.equals(hash)) {
+				cb.accept(rp);
+				return;
+			}
+		}
+		PlatformRuntime.downloadRemoteURIByteArray(url, arr -> {
+			ast.accept(() -> {
+				if (arr == null) {
+					cb.accept(null);
+					return;
+				}
+				SHA1Digest digest = new SHA1Digest();
+				digest.update(arr, 0, arr.length);
+				byte[] hashOut = new byte[20];
+				digest.doFinal(hashOut, 0);
+				if(!hash.equals(ArrayUtils.hexString(hashOut))) {
+					logger.error("Downloaded resource pack hash does not equal expected resource pack hash!");
+					cb.accept(null);
+					return;
+				}
+				if(lst.size() >= 5) {
+					lst.sort(Comparator.comparingLong(pack -> pack.timestamp));
+					for(int i = 0; i < lst.size() - 5; i++) {
+						deleteResourcePack(SERVER_RESOURCE_PACKS, lst.get(i).resourcePackFile);
+					}
+				}
+				loading.run();
+				try {
+					cb.accept(importResourcePack(hash, SERVER_RESOURCE_PACKS, arr));
+				}catch(IOException ex) {
+					logger.error("Failed to load resource pack downloaded from server!");
+					logger.error(ex);
+					cb.accept(null);
+				}
+			});
+		});
+	}
+
+	public static void deleteResourcePack(EaglerFolderResourcePack pack) {
+		deleteResourcePack(pack.prefix, pack.resourcePackFile);
+	}
+
+	public static void deleteResourcePack(String prefix, String name) {
+		if (!isSupported) {
+			return;
+		}
+		logger.info("Deleting resource pack: {}/{}", prefix, name);
+		(new VFile2(prefix, name)).listFiles(true).forEach(VFile2::delete);
+		VFile2 manifestFile = new VFile2(prefix, "manifest.json");
+		String str = manifestFile.getAllChars();
+		if(str != null) {
+			try {
+				JSONArray json = (new JSONObject(str)).getJSONArray("resourcePacks");
+				boolean changed = false;
+				for(int i = 0, l = json.length(); i < l; ++i) {
+					if(json.getJSONObject(i).getString("folder").equals(name)) {
+						json.remove(i);
+						changed = true;
+						break;
+					}
+				}
+				if(changed) {
+					manifestFile.setAllChars((new JSONObject()).put("resourcePacks", json).toString());
+				}else {
+					logger.warn("Failed to remove pack \"{}\" from manifest, it wasn't found in the list for some reason", name);
+				}
+			}catch(JSONException ex) {
+			}
+		}
+	}
+
+	public static void deleteOldResourcePacks(String prefix, long maxAge) {
+		if (!isSupported) {
+			return;
+		}
+		long millis = System.currentTimeMillis();
+		List<EaglerFolderResourcePack> lst = getFolderResourcePacks(prefix);
+		for(int i = 0, l = lst.size(); i < l; ++i) {
+			EaglerFolderResourcePack rp = lst.get(i);
+			if(millis - rp.timestamp > maxAge) {
+				deleteResourcePack(rp);
+			}
+		}
+	}
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/EaglerTextureAtlasSprite.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/EaglerTextureAtlasSprite.java
index b4fc9d7..dcba810 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/EaglerTextureAtlasSprite.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/EaglerTextureAtlasSprite.java
@@ -273,7 +273,8 @@ public class EaglerTextureAtlasSprite {
 						public String call() throws Exception {
 							StringBuilder stringbuilder = new StringBuilder();
 
-							for (int[] aint1 : aint) {
+							for (int j = 0; j < aint.length; ++j) {
+								int[] aint1 = aint[j];
 								if (stringbuilder.length() > 0) {
 									stringbuilder.append(", ");
 								}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/GuiScreenGenericErrorMessage.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/GuiScreenGenericErrorMessage.java
new file mode 100755
index 0000000..51e4f53
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/GuiScreenGenericErrorMessage.java
@@ -0,0 +1,52 @@
+package net.lax1dude.eaglercraft.v1_8.minecraft;
+
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.I18n;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GuiScreenGenericErrorMessage extends GuiScreen {
+
+	private String str1;
+	private String str2;
+	private GuiScreen cont;
+
+	public GuiScreenGenericErrorMessage(String str1, String str2, GuiScreen cont) {
+		this.str1 = I18n.format(str1);
+		this.str2 = I18n.format(str2);
+		this.cont = cont;
+	}
+
+	public void initGui() {
+		this.buttonList.clear();
+		this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 6 + 96, I18n.format("gui.done")));
+	}
+
+	public void drawScreen(int par1, int par2, float par3) {
+		this.drawDefaultBackground();
+		this.drawCenteredString(fontRendererObj, str1, this.width / 2, 70, 11184810);
+		this.drawCenteredString(fontRendererObj, str2, this.width / 2, 90, 16777215);
+		super.drawScreen(par1, par2, par3);
+	}
+
+	protected void actionPerformed(GuiButton par1GuiButton) {
+		if(par1GuiButton.id == 0) {
+			this.mc.displayGuiScreen(cont);
+		}
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/netty/ObjectUtil.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/netty/ObjectUtil.java
index 740750e..6799e4e 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/netty/ObjectUtil.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/netty/ObjectUtil.java
@@ -53,8 +53,8 @@ public final class ObjectUtil {
 			throw new NullPointerException(text);
 		}
 
-		for (T element : varargs) {
-			if (element == null) {
+		for (int i = 0; i < varargs.length; ++i) {
+			if (varargs[i] == null) {
 				throw new NullPointerException(text);
 			}
 		}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/FixedFunctionPipeline.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/FixedFunctionPipeline.java
index fce02db..136b396 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/FixedFunctionPipeline.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/FixedFunctionPipeline.java
@@ -11,7 +11,6 @@ import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
 
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.internal.IBufferArrayGL;
-import net.lax1dude.eaglercraft.v1_8.internal.IBufferGL;
 import net.lax1dude.eaglercraft.v1_8.internal.IProgramGL;
 import net.lax1dude.eaglercraft.v1_8.internal.IShaderGL;
 import net.lax1dude.eaglercraft.v1_8.internal.IUniformGL;
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/InstancedFontRenderer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/InstancedFontRenderer.java
index d0c171e..3101682 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/InstancedFontRenderer.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/InstancedFontRenderer.java
@@ -202,7 +202,7 @@ public class InstancedFontRenderer {
 		_wglVertexAttribDivisor(0, 0);
 
 		EaglercraftGPU.bindGLArrayBuffer(instancesBuffer);
-		_wglBufferData(GL_ARRAY_BUFFER, fontDataBuffer.remaining(), GL_STATIC_DRAW);
+		_wglBufferData(GL_ARRAY_BUFFER, fontDataBuffer.remaining(), GL_STREAM_DRAW);
 
 		_wglEnableVertexAttribArray(1);
 		_wglVertexAttribPointer(1, 2, GL_SHORT, false, 10, 0);
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/InstancedParticleRenderer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/InstancedParticleRenderer.java
index 2c452b4..9419900 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/InstancedParticleRenderer.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/InstancedParticleRenderer.java
@@ -184,7 +184,7 @@ public class InstancedParticleRenderer {
 		_wglVertexAttribDivisor(0, 0);
 
 		EaglercraftGPU.bindGLArrayBuffer(instancesBuffer);
-		_wglBufferData(GL_ARRAY_BUFFER, particleBuffer.remaining(), GL_STATIC_DRAW);
+		_wglBufferData(GL_ARRAY_BUFFER, particleBuffer.remaining(), GL_STREAM_DRAW);
 
 		_wglEnableVertexAttribArray(1);
 		_wglVertexAttribPointer(1, 3, GL_FLOAT, false, 24, 0);
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/SpriteLevelMixer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/SpriteLevelMixer.java
index 356a927..75eea72 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/SpriteLevelMixer.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/SpriteLevelMixer.java
@@ -4,8 +4,6 @@ import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
 import static net.lax1dude.eaglercraft.v1_8.internal.PlatformOpenGL.*;
 
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
-import net.lax1dude.eaglercraft.v1_8.internal.IBufferArrayGL;
-import net.lax1dude.eaglercraft.v1_8.internal.IBufferGL;
 import net.lax1dude.eaglercraft.v1_8.internal.IProgramGL;
 import net.lax1dude.eaglercraft.v1_8.internal.IShaderGL;
 import net.lax1dude.eaglercraft.v1_8.internal.IUniformGL;
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/EaglerDeferredPipeline.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/EaglerDeferredPipeline.java
index f59144d..6e5c8de 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/EaglerDeferredPipeline.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/EaglerDeferredPipeline.java
@@ -380,7 +380,7 @@ public class EaglerDeferredPipeline {
 
 	public void rebuild(EaglerDeferredConfig config) {
 		destroy();
-		DeferredStateManager.doCheckErrors = EagRuntime.getConfiguration().checkShaderGLErrors();
+		DeferredStateManager.doCheckErrors = EagRuntime.getConfiguration().isCheckShaderGLErrors();
 		DeferredStateManager.checkGLError("Pre: rebuild pipeline");
 		this.config = config;
 		this.currentWidth = -1;
@@ -3302,7 +3302,7 @@ public class EaglerDeferredPipeline {
 			GlStateManager.bindTexture(bloomVBlurTexture);
 			GlStateManager.enableBlend();
 			GlStateManager.tryBlendFuncSeparate(GL_CONSTANT_ALPHA, GL_ONE, GL_ZERO, GL_ONE);
-			GlStateManager.setBlendConstants(0.0f, 0.0f, 0.0f, 0.25f);
+			GlStateManager.setBlendConstants(0.0f, 0.0f, 0.0f, 0.15f);
 			TextureCopyUtil.blitTexture();
 			GlStateManager.disableBlend();
 
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/ForwardAcceleratedEffectRenderer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/ForwardAcceleratedEffectRenderer.java
index 982ede8..525db9a 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/ForwardAcceleratedEffectRenderer.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/ForwardAcceleratedEffectRenderer.java
@@ -12,7 +12,6 @@ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.program.PipelineShaderAccelParticleForward;
-import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.program.PipelineShaderAccelParticleGBuffer;
 import net.lax1dude.eaglercraft.v1_8.vector.Matrix4f;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
@@ -92,7 +91,7 @@ public class ForwardAcceleratedEffectRenderer extends AbstractAcceleratedEffectR
 		_wglVertexAttribDivisor(0, 0);
 
 		EaglercraftGPU.bindGLArrayBuffer(instancesBuffer);
-		_wglBufferData(GL_ARRAY_BUFFER, particleBuffer.remaining(), GL_STATIC_DRAW);
+		_wglBufferData(GL_ARRAY_BUFFER, particleBuffer.remaining(), GL_STREAM_DRAW);
 
 		_wglEnableVertexAttribArray(1);
 		_wglVertexAttribPointer(1, 3, GL_FLOAT, false, 24, 0);
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/GBufferAcceleratedEffectRenderer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/GBufferAcceleratedEffectRenderer.java
index 2c17d23..3e07db2 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/GBufferAcceleratedEffectRenderer.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/GBufferAcceleratedEffectRenderer.java
@@ -91,7 +91,7 @@ public class GBufferAcceleratedEffectRenderer extends AbstractAcceleratedEffectR
 		_wglVertexAttribDivisor(0, 0);
 
 		EaglercraftGPU.bindGLArrayBuffer(instancesBuffer);
-		_wglBufferData(GL_ARRAY_BUFFER, particleBuffer.remaining(), GL_STATIC_DRAW);
+		_wglBufferData(GL_ARRAY_BUFFER, particleBuffer.remaining(), GL_STREAM_DRAW);
 
 		_wglEnableVertexAttribArray(1);
 		_wglVertexAttribPointer(1, 3, GL_FLOAT, false, 24, 0);
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/LensFlareMeshRenderer.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/LensFlareMeshRenderer.java
index 06df19f..3f3e924 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/LensFlareMeshRenderer.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/LensFlareMeshRenderer.java
@@ -4,12 +4,11 @@ import static net.lax1dude.eaglercraft.v1_8.internal.PlatformOpenGL.*;
 import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
 import static net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.ExtGLEnums.*;
 
-import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.io.IOException;
 
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
-import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
+import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
 import net.lax1dude.eaglercraft.v1_8.internal.IBufferArrayGL;
 import net.lax1dude.eaglercraft.v1_8.internal.IBufferGL;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
@@ -162,7 +161,7 @@ public class LensFlareMeshRenderer {
 		if(flareTex == null) {
 			throw new RuntimeException("Could not locate: " + streaksTextureLocation);
 		}
-		try(DataInputStream dis = new DataInputStream(new ByteArrayInputStream(flareTex))) {
+		try(DataInputStream dis = new DataInputStream(new EaglerInputStream(flareTex))) {
 			loadFlareTexture(copyBuffer, dis);
 		}catch(IOException ex) {
 			EagRuntime.freeByteBuffer(copyBuffer);
@@ -175,7 +174,7 @@ public class LensFlareMeshRenderer {
 		if(flareTex == null) {
 			throw new RuntimeException("Could not locate: " + ghostsTextureLocation);
 		}
-		try(DataInputStream dis = new DataInputStream(new ByteArrayInputStream(flareTex))) {
+		try(DataInputStream dis = new DataInputStream(new EaglerInputStream(flareTex))) {
 			loadFlareTexture(copyBuffer, dis);
 		}catch(IOException ex) {
 			EagRuntime.freeByteBuffer(copyBuffer);
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/EaglerTextureAtlasSpritePBR.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/EaglerTextureAtlasSpritePBR.java
index dce22fc..d23fae5 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/EaglerTextureAtlasSpritePBR.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/EaglerTextureAtlasSpritePBR.java
@@ -14,7 +14,6 @@ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
 import net.lax1dude.eaglercraft.v1_8.minecraft.TextureAnimationCache;
-import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
 import net.minecraft.client.renderer.texture.TextureUtil;
 import net.minecraft.client.resources.data.AnimationFrame;
@@ -187,11 +186,12 @@ public class EaglerTextureAtlasSpritePBR extends EaglerTextureAtlasSprite {
 							public String call() throws Exception {
 								StringBuilder stringbuilder = new StringBuilder();
 	
-								for (int[] aint1 : aint) {
+								for (int k = 0; k < aint.length; ++k) {
 									if (stringbuilder.length() > 0) {
 										stringbuilder.append(", ");
 									}
 	
+									int[] aint1 = aint[k];
 									stringbuilder.append(aint1 == null ? "null" : Integer.valueOf(aint1.length));
 								}
 	
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/PBRTextureMapUtils.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/PBRTextureMapUtils.java
index c195ec4..0e73b67 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/PBRTextureMapUtils.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/PBRTextureMapUtils.java
@@ -46,7 +46,8 @@ public class PBRTextureMapUtils {
 		}
 		try {
 			List<IResource> ress = resMgr.getAllResources(new ResourceLocation(domain, fname));
-			for(IResource res : ress) {
+			for(int k = 0, l = ress.size(); k < l; ++k) {
+				IResource res = ress.get(k);
 				if(res.getResourcePackName().equals(resourcePack)) {
 					ImageData toRet = TextureUtil.readBufferedImage(res.getInputStream());
 					if(ext.equals("_s")) {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/TextureClockPBRImpl.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/TextureClockPBRImpl.java
index 698fe7e..e7442e7 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/TextureClockPBRImpl.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/TextureClockPBRImpl.java
@@ -1,7 +1,6 @@
 package net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.texture;
 
 import net.lax1dude.eaglercraft.v1_8.internal.IFramebufferGL;
-import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.MathHelper;
 
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/TextureCompassPBRImpl.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/TextureCompassPBRImpl.java
index 86d7bd2..02c1482 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/TextureCompassPBRImpl.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/texture/TextureCompassPBRImpl.java
@@ -1,7 +1,6 @@
 package net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.texture;
 
 import net.lax1dude.eaglercraft.v1_8.internal.IFramebufferGL;
-import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.MathHelper;
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/EaglerProfile.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/EaglerProfile.java
index 3b72bc2..69e904e 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/EaglerProfile.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/EaglerProfile.java
@@ -1,17 +1,16 @@
 package net.lax1dude.eaglercraft.v1_8.profile;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
+import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 import net.minecraft.client.Minecraft;
 import net.minecraft.nbt.CompressedStreamTools;
-import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.util.ResourceLocation;
@@ -148,8 +147,10 @@ public class EaglerProfile {
 	}
 
 	public static void read() {
-		byte[] profileStorage = EagRuntime.getStorage("p");
+		read(EagRuntime.getStorage("p"));
+	}
 
+	public static void read(byte[] profileStorage) {
 		if (profileStorage == null) {
 			return;
 		}
@@ -207,7 +208,7 @@ public class EaglerProfile {
 
 	}
 
-	public static void write() {
+	public static byte[] write() {
 		NBTTagCompound profile = new NBTTagCompound();
 		profile.setInteger("presetSkin", presetSkinId);
 		profile.setInteger("customSkin", customSkinId);
@@ -222,13 +223,20 @@ public class EaglerProfile {
 			skinsList.appendTag(skin);
 		}
 		profile.setTag("skins", skinsList);
-		ByteArrayOutputStream bao = new ByteArrayOutputStream();
+		EaglerOutputStream bao = new EaglerOutputStream();
 		try {
 			CompressedStreamTools.writeCompressed(profile, bao);
 		} catch (IOException e) {
-			return;
+			return null;
+		}
+		return bao.toByteArray();
+	}
+
+	public static void save() {
+		byte[] b = write();
+		if(b != null) {
+			EagRuntime.setStorage("p", b);
 		}
-		EagRuntime.setStorage("p", bao.toByteArray());
 	}
 
 	static {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenEditProfile.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenEditProfile.java
index a5722fe..a0135c6 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenEditProfile.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenEditProfile.java
@@ -3,13 +3,16 @@ package net.lax1dude.eaglercraft.v1_8.profile;
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
 import net.lax1dude.eaglercraft.v1_8.Mouse;
+import net.lax1dude.eaglercraft.v1_8.internal.EnumCursorType;
 import net.lax1dude.eaglercraft.v1_8.internal.FileChooserResult;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
+import net.minecraft.client.audio.PositionedSoundRecord;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.client.resources.I18n;
+import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.ResourceLocation;
 
 import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
@@ -162,6 +165,23 @@ public class GuiScreenEditProfile extends GuiScreen {
 			drawRect(skinX + skinWidth - 4, skinY + scrollerPos + 1, skinX + skinWidth - 1, skinY + scrollerPos + scrollerSize, 0xff888888);
 		}
 
+		if(!EagRuntime.getConfiguration().isDemo()) {
+			GlStateManager.pushMatrix();
+			GlStateManager.scale(0.75f, 0.75f, 0.75f);
+			GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
+			String text = I18n.format("editProfile.importExport");
+			
+			int w = mc.fontRendererObj.getStringWidth(text);
+			boolean hover = mx > 1 && my > 1 && mx < (w * 3 / 4) + 7 && my < 12;
+			if(hover) {
+				Mouse.showCursor(EnumCursorType.HAND);
+			}
+	
+			drawString(mc.fontRendererObj, EnumChatFormatting.UNDERLINE + text, 5, 5, hover ? 0xFFEEEE22 : 0xFFCCCCCC);
+			
+			GlStateManager.popMatrix();
+		}
+
 		int xx = width / 2 - 80;
 		int yy = height / 6 + 130;
 		int numberOfCustomSkins = EaglerProfile.customSkins.size();
@@ -370,6 +390,15 @@ public class GuiScreenEditProfile extends GuiScreen {
 		super.mouseClicked(mx, my, button);
 		usernameField.mouseClicked(mx, my, button);
 		if (button == 0) {
+			if(!EagRuntime.getConfiguration().isDemo()) {
+				int w = mc.fontRendererObj.getStringWidth(I18n.format("editProfile.importExport"));
+				if(mx > 1 && my > 1 && mx < (w * 3 / 4) + 7 && my < 12) {
+					mc.displayGuiScreen(new GuiScreenImportExportProfile(this));
+					mc.getSoundHandler().playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F));
+					return;
+				}
+			}
+			
 			if(newSkinWaitSteveOrAlex) {
 				int skinX = width / 2 - 90;
 				int skinY = height / 4;
@@ -459,7 +488,7 @@ public class GuiScreenEditProfile extends GuiScreen {
 			name = name.substring(0, 16);
 		}
 		EaglerProfile.setName(name);
-		EaglerProfile.write();
+		EaglerProfile.save();
 	}
 
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenExportProfile.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenExportProfile.java
new file mode 100755
index 0000000..3b2705b
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenExportProfile.java
@@ -0,0 +1,90 @@
+package net.lax1dude.eaglercraft.v1_8.profile;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerFolderResourcePack;
+import net.lax1dude.eaglercraft.v1_8.minecraft.GuiScreenGenericErrorMessage;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.I18n;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GuiScreenExportProfile extends GuiScreen {
+
+	private GuiScreen back;
+
+	private GuiButton exportProfile;
+	private boolean doExportProfile = true;
+	private GuiButton exportSettings;
+	private boolean doExportSettings = true;
+	private GuiButton exportServers;
+	private boolean doExportServers = true;
+	private GuiButton exportResourcePacks;
+	private boolean doExportResourcePacks = false;
+
+	public GuiScreenExportProfile(GuiScreen back) {
+		this.back = back;
+	}
+
+	public void initGui() {
+		this.buttonList.add(exportProfile = new GuiButton(2, this.width / 2 - 100, this.height / 4, I18n.format("settingsBackup.export.option.profile") + " " + I18n.format(doExportProfile ? "gui.yes" : "gui.no")));
+		this.buttonList.add(exportSettings = new GuiButton(3, this.width / 2 - 100, this.height / 4 + 25, I18n.format("settingsBackup.export.option.settings") + " " + I18n.format(doExportSettings ? "gui.yes" : "gui.no")));
+		this.buttonList.add(exportServers = new GuiButton(4, this.width / 2 - 100, this.height / 4 + 50, I18n.format("settingsBackup.export.option.servers") + " " + I18n.format(doExportServers ? "gui.yes" : "gui.no")));
+		this.buttonList.add(exportResourcePacks = new GuiButton(5, this.width / 2 - 100, this.height / 4 + 75, I18n.format("settingsBackup.export.option.resourcePacks") + " " + I18n.format(doExportResourcePacks ? "gui.yes" : "gui.no")));
+		exportResourcePacks.enabled = EaglerFolderResourcePack.isSupported();
+		this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 4 + 115, I18n.format("settingsBackup.export.option.export")));
+		this.buttonList.add(new GuiButton(1, this.width / 2 - 100, this.height / 4 + 140, I18n.format("gui.cancel")));
+	}
+
+	protected void actionPerformed(GuiButton par1GuiButton) {
+		if(par1GuiButton.id == 0) {
+			if(!doExportProfile && !doExportSettings && !doExportServers && !doExportResourcePacks) {
+				mc.displayGuiScreen(back);
+			}else {
+				mc.loadingScreen.eaglerShow(I18n.format("settingsBackup.exporting.1"), I18n.format("settingsBackup.exporting.2"));
+				try {
+					ProfileExporter.exportProfileAndSettings(doExportProfile, doExportSettings, doExportServers, doExportResourcePacks);
+					mc.displayGuiScreen(back);
+				} catch (IOException e) {
+					EagRuntime.debugPrintStackTrace(e);
+					mc.displayGuiScreen(new GuiScreenGenericErrorMessage("settingsBackup.exporting.failed.1", "settingsBackup.exporting.failed.2", back));
+				}
+			}
+		}else if(par1GuiButton.id == 1) {
+			mc.displayGuiScreen(back);
+		}else if(par1GuiButton.id == 2) {
+			doExportProfile = !doExportProfile;
+			exportProfile.displayString = I18n.format("settingsBackup.export.option.profile") + " " + I18n.format(doExportProfile ? "gui.yes" : "gui.no");
+		}else if(par1GuiButton.id == 3) {
+			doExportSettings = !doExportSettings;
+			exportSettings.displayString = I18n.format("settingsBackup.export.option.settings") + " " + I18n.format(doExportSettings ? "gui.yes" : "gui.no");
+		}else if(par1GuiButton.id == 4) {
+			doExportServers = !doExportServers;
+			exportServers.displayString = I18n.format("settingsBackup.export.option.servers") + " " + I18n.format(doExportServers ? "gui.yes" : "gui.no");
+		}else if(par1GuiButton.id == 5) {
+			doExportResourcePacks = !doExportResourcePacks;
+			exportResourcePacks.displayString = I18n.format("settingsBackup.export.option.resourcePacks") + " " + I18n.format(doExportResourcePacks ? "gui.yes" : "gui.no");
+		}
+	}
+
+	public void drawScreen(int par1, int par2, float par3) {
+		this.drawDefaultBackground();
+		this.drawCenteredString(this.fontRendererObj, I18n.format("settingsBackup.export.title"), this.width / 2, this.height / 4 - 25, 16777215);
+		super.drawScreen(par1, par2, par3);
+	}
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenImportExportProfile.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenImportExportProfile.java
new file mode 100755
index 0000000..01c9ae8
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenImportExportProfile.java
@@ -0,0 +1,78 @@
+package net.lax1dude.eaglercraft.v1_8.profile;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.internal.FileChooserResult;
+import net.lax1dude.eaglercraft.v1_8.minecraft.GuiScreenGenericErrorMessage;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.I18n;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GuiScreenImportExportProfile extends GuiScreen {
+
+	private GuiScreen back;
+	private boolean waitingForFile = false;
+
+	public GuiScreenImportExportProfile(GuiScreen back) {
+		this.back = back;
+	}
+
+	public void initGui() {
+		this.buttonList.add(new GuiButton(1, this.width / 2 - 100, this.height / 4 + 40, I18n.format("settingsBackup.importExport.import")));
+		this.buttonList.add(new GuiButton(2, this.width / 2 - 100, this.height / 4 + 65, I18n.format("settingsBackup.importExport.export")));
+		this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 4 + 130, I18n.format("gui.cancel")));
+	}
+
+	protected void actionPerformed(GuiButton par1GuiButton) {
+		if(par1GuiButton.id == 0) {
+			mc.displayGuiScreen(back);
+		}else if(par1GuiButton.id == 1) {
+			waitingForFile = true;
+			EagRuntime.displayFileChooser(null, "epk");
+		}else if(par1GuiButton.id == 2) {
+			mc.displayGuiScreen(new GuiScreenExportProfile(back));
+		}
+	}
+
+	public void updateScreen() {
+		if(waitingForFile && EagRuntime.fileChooserHasResult()) {
+			waitingForFile = false;
+			FileChooserResult result = EagRuntime.getFileChooserResult();
+			if(result != null) {
+				mc.loadingScreen.eaglerShow(I18n.format("settingsBackup.importing.1"), "settingsBackup.importing.2");
+				try {
+					ProfileImporter importer = new ProfileImporter(result.fileData);
+					importer.readHeader();
+					mc.displayGuiScreen(new GuiScreenImportProfile(importer, back));
+				}catch(IOException ex) {
+					EagRuntime.debugPrintStackTrace(ex);
+					mc.displayGuiScreen(new GuiScreenGenericErrorMessage("settingsBackup.importing.failed.1", "settingsBackup.importing.failed.2", back));
+				}
+			}
+		}
+	}
+
+	public void drawScreen(int par1, int par2, float par3) {
+		this.drawDefaultBackground();
+		
+		this.drawCenteredString(this.fontRendererObj, I18n.format("settingsBackup.importExport.title"), this.width / 2, this.height / 4, 16777215);
+		
+		super.drawScreen(par1, par2, par3);
+	}
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenImportProfile.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenImportProfile.java
new file mode 100755
index 0000000..3f1f3fc
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenImportProfile.java
@@ -0,0 +1,111 @@
+package net.lax1dude.eaglercraft.v1_8.profile;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerFolderResourcePack;
+import net.lax1dude.eaglercraft.v1_8.minecraft.GuiScreenGenericErrorMessage;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.resources.ResourcePackRepository;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GuiScreenImportProfile extends GuiScreen {
+
+	private GuiScreen back;
+	private ProfileImporter importer;
+
+	private GuiButton importProfile;
+	private boolean doImportProfile;
+	private GuiButton importSettings;
+	private boolean doImportSettings;
+	private GuiButton importServers;
+	private boolean doImportServers;
+	private GuiButton importResourcePacks;
+	private boolean doImportResourcePacks;
+
+	public GuiScreenImportProfile(ProfileImporter importer, GuiScreen back) {
+		this.back = back;
+		this.importer = importer;
+		this.doImportProfile = importer.hasProfile();
+		this.doImportSettings = importer.hasSettings();
+		this.doImportServers = importer.hasSettings();
+		this.doImportResourcePacks = importer.hasResourcePacks();
+	}
+
+	public void initGui() {
+		this.buttonList.add(importProfile = new GuiButton(2, this.width / 2 - 100, this.height / 4, I18n.format("settingsBackup.import.option.profile") + " " + I18n.format(doImportProfile ? "gui.yes" : "gui.no")));
+		importProfile.enabled = importer.hasProfile();
+		this.buttonList.add(importSettings = new GuiButton(3, this.width / 2 - 100, this.height / 4 + 25, I18n.format("settingsBackup.import.option.settings") + " " + I18n.format(doImportSettings ? "gui.yes" : "gui.no")));
+		importSettings.enabled = importer.hasProfile();
+		this.buttonList.add(importServers = new GuiButton(4, this.width / 2 - 100, this.height / 4 + 50, I18n.format("settingsBackup.import.option.servers") + " " + I18n.format(doImportServers ? "gui.yes" : "gui.no")));
+		importServers.enabled = importer.hasServers();
+		this.buttonList.add(importResourcePacks = new GuiButton(5, this.width / 2 - 100, this.height / 4 + 75, I18n.format("settingsBackup.import.option.resourcePacks") + " " + I18n.format(doImportResourcePacks ? "gui.yes" : "gui.no")));
+		importResourcePacks.enabled = importer.hasResourcePacks() && EaglerFolderResourcePack.isSupported();
+		this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 4 + 115, I18n.format("settingsBackup.import.option.import")));
+		this.buttonList.add(new GuiButton(1, this.width / 2 - 100, this.height / 4 + 140, I18n.format("gui.cancel")));
+	}
+
+	protected void actionPerformed(GuiButton par1GuiButton) {
+		if(par1GuiButton.id == 0) {
+			if(!doImportProfile && !doImportSettings && !doImportServers && !doImportResourcePacks) {
+				mc.displayGuiScreen(back);
+			}else {
+				mc.loadingScreen.eaglerShow(I18n.format("settingsBackup.importing.1"), I18n.format("settingsBackup.importing.2"));
+				try {
+					List<String> list1 = new ArrayList(mc.gameSettings.resourcePacks); 
+					List<String> list2 = new ArrayList(mc.gameSettings.field_183018_l);
+					importer.importProfileAndSettings(doImportProfile, doImportSettings, doImportServers, doImportResourcePacks);
+					boolean resourcePacksChanged = !mc.gameSettings.resourcePacks.equals(list1) || !mc.gameSettings.field_183018_l.equals(list2);
+					if(resourcePacksChanged || (doImportResourcePacks && (list1.size() > 0 || list2.size() > 0))) {
+						mc.loadingScreen.eaglerShow(I18n.format("resourcePack.load.refreshing"),
+								I18n.format("resourcePack.load.pleaseWait"));
+						mc.getResourcePackRepository().reconstruct(mc.gameSettings);
+						mc.refreshResources();
+					}
+					mc.displayGuiScreen(back);
+				} catch (IOException e) {
+					EagRuntime.debugPrintStackTrace(e);
+					mc.displayGuiScreen(new GuiScreenGenericErrorMessage("settingsBackup.importing.failed.1", "settingsBackup.importing.failed.2", back));
+				}
+			}
+		}else if(par1GuiButton.id == 1) {
+			mc.displayGuiScreen(back);
+		}else if(par1GuiButton.id == 2) {
+			doImportProfile = !doImportProfile;
+			importProfile.displayString = I18n.format("settingsBackup.import.option.profile") + " " + I18n.format(doImportProfile ? "gui.yes" : "gui.no");
+		}else if(par1GuiButton.id == 3) {
+			doImportSettings = !doImportSettings;
+			importSettings.displayString = I18n.format("settingsBackup.import.option.settings") + " " + I18n.format(doImportSettings ? "gui.yes" : "gui.no");
+		}else if(par1GuiButton.id == 4) {
+			doImportServers = !doImportServers;
+			importServers.displayString = I18n.format("settingsBackup.import.option.servers") + " " + I18n.format(doImportServers ? "gui.yes" : "gui.no");
+		}else if(par1GuiButton.id == 5) {
+			doImportResourcePacks = !doImportResourcePacks;
+			importResourcePacks.displayString = I18n.format("settingsBackup.import.option.resourcePacks") + " " + I18n.format(doImportResourcePacks ? "gui.yes" : "gui.no");
+		}
+	}
+
+	public void drawScreen(int par1, int par2, float par3) {
+		this.drawDefaultBackground();
+		this.drawCenteredString(this.fontRendererObj, I18n.format("settingsBackup.import.title"), this.width / 2, this.height / 4 - 25, 16777215);
+		super.drawScreen(par1, par2, par3);
+	}
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/ProfileExporter.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/ProfileExporter.java
new file mode 100755
index 0000000..6726f52
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/ProfileExporter.java
@@ -0,0 +1,195 @@
+package net.lax1dude.eaglercraft.v1_8.profile;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.zip.CRC32;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
+import net.lax1dude.eaglercraft.v1_8.EaglerZLIB;
+import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerFolderResourcePack;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayManager;
+import net.lax1dude.eaglercraft.v1_8.update.UpdateCertificate;
+import net.lax1dude.eaglercraft.v1_8.update.UpdateService;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ServerList;
+
+import static net.lax1dude.eaglercraft.v1_8.sp.server.export.EPKCompiler.*;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class ProfileExporter {
+
+	private static final Logger logger = LogManager.getLogger("ProfileExporter");
+
+	public static void exportProfileAndSettings(boolean doExportProfile, boolean doExportSettings,
+			boolean doExportServers, boolean doExportResourcePacks) throws IOException {
+		doExportResourcePacks &= EaglerFolderResourcePack.isSupported();
+		EaglerOutputStream osb = new EaglerOutputStream();
+		osb.write(new byte[]{(byte)69,(byte)65,(byte)71,(byte)80,(byte)75,(byte)71,(byte)36,(byte)36}); // EAGPKG$$
+		osb.write(new byte[]{(byte)6,(byte)118,(byte)101,(byte)114,(byte)50,(byte)46,(byte)48}); // 6 + ver2.0
+		Date d = new Date();
+		
+		byte[] filename = "profile.epk".getBytes(StandardCharsets.UTF_8);
+		osb.write(filename.length);
+		osb.write(filename);
+		
+		byte[] comment = ("\n\n #  Eaglercraft profile backup - \"" + EaglerProfile.getName() + "\""
+				+ "\n #  Contains: " + (doExportProfile ? "profile " : "") + (doExportSettings ? "settings " : "")
+				+ (doExportServers ? "servers " : "") + (doExportResourcePacks ? "resourcePacks" : "") + "\n\n")
+				.getBytes(StandardCharsets.UTF_8);
+
+		osb.write((comment.length >> 8) & 255);
+		osb.write(comment.length & 255);
+		osb.write(comment);
+		
+		writeLong(d.getTime(), osb);
+		
+		int lengthIntegerOffset = osb.size();
+		osb.write(new byte[]{(byte)255,(byte)255,(byte)255,(byte)255}); // this will be replaced with the file count
+		
+		osb.write('G');
+		OutputStream os = EaglerZLIB.newGZIPOutputStream(osb);
+		
+		os.write(new byte[]{(byte)72,(byte)69,(byte)65,(byte)68}); // HEAD
+		os.write(new byte[]{(byte)9,(byte)102,(byte)105,(byte)108,(byte)101,(byte)45,(byte)116,(byte)121,
+				(byte)112,(byte)101}); // 9 + file-type
+		os.write(new byte[]{(byte)0,(byte)0,(byte)0,(byte)14,(byte)101,(byte)112,(byte)107,(byte)47,(byte)112,(byte)114,(byte)111,
+				(byte)102,(byte)105,(byte)108,(byte)101,(byte)49,(byte)56,(byte)56}); // 14 + epk/profile188
+		os.write('>');
+		
+		os.write(new byte[]{(byte)72,(byte)69,(byte)65,(byte)68}); // HEAD
+		os.write(new byte[]{(byte)12,(byte)102,(byte)105,(byte)108,(byte)101,(byte)45,(byte)101,(byte)120,
+				(byte)112,(byte)111,(byte)114,(byte)116,(byte)115,(byte)0,(byte)0,(byte)0,(byte)1}); // 12 + file-exports + 1
+		os.write((doExportProfile ? 1 : 0) | (doExportSettings ? 2 : 0) | (doExportServers ? 4 : 0) | (doExportResourcePacks ? 8 : 0));
+		os.write('>');
+		
+		int fileCount = 2;
+		
+		if(doExportProfile) {
+			byte[] profileData = EaglerProfile.write();
+			if(profileData == null) {
+				throw new IOException("Could not write profile data!");
+			}
+			exportFileToEPK("_eaglercraftX.p", profileData, os);
+			++fileCount;
+		}
+		
+		if(doExportSettings) {
+			logger.info("Exporting game settings...");
+			byte[] gameSettings = Minecraft.getMinecraft().gameSettings.writeOptions();
+			if(gameSettings == null) {
+				throw new IOException("Could not write game settings!");
+			}
+			exportFileToEPK("_eaglercraftX.g", gameSettings, os);
+			++fileCount;
+			logger.info("Exporting relay settings...");
+			byte[] relays = RelayManager.relayManager.write();
+			if(relays == null) {
+				throw new IOException("Could not write relay settings!");
+			}
+			exportFileToEPK("_eaglercraftX.r", relays, os);
+			++fileCount;
+		}
+		
+		if(doExportServers) {
+			logger.info("Exporting server list...");
+			byte[] servers = ServerList.getServerList().writeServerList();
+			if(servers == null) {
+				throw new IOException("Could not write server list!");
+			}
+			exportFileToEPK("_eaglercraftX.s", servers, os);
+			++fileCount;
+		}
+		
+		logger.info("Exporting certificates...");
+		UpdateCertificate cert = UpdateService.getClientCertificate();
+		if(cert != null) {
+			exportFileToEPK("certs/main.cert", cert.rawCertData, os);
+			++fileCount;
+		}
+		Collection<UpdateCertificate> updatesExport = UpdateService.getAvailableUpdates();
+		int cc = 0;
+		for(UpdateCertificate cert2 : updatesExport) {
+			exportFileToEPK("certs/c" + (cc++) + ".cert", cert2.rawCertData, os);
+			++fileCount;
+		}
+		
+		if(doExportResourcePacks) {
+			logger.info("Exporting resource packs...");
+			byte[] packManifest = (new VFile2(EaglerFolderResourcePack.RESOURCE_PACKS + "/manifest.json")).getAllBytes();
+			if(packManifest != null) {
+				exportFileToEPK(EaglerFolderResourcePack.RESOURCE_PACKS + "/manifest.json", packManifest, os);
+				++fileCount;
+				VFile2 baseDir = new VFile2(EaglerFolderResourcePack.RESOURCE_PACKS);
+				List<VFile2> files = baseDir.listFiles(true);
+				logger.info("({} files to export)", files.size());
+				for(int i = 0, l = files.size(); i < l; ++i) {
+					VFile2 f = files.get(i);
+					if(f.getPath().equals(EaglerFolderResourcePack.RESOURCE_PACKS + "/manifest.json")) {
+						continue;
+					}
+					exportFileToEPK(f.getPath(), f.getAllBytes(), os);
+					++fileCount;
+					if(i > 0 && i % 100 == 0) {
+						logger.info("Exported {} files", i);
+					}
+				}
+			}
+		}
+		
+		os.write(new byte[]{(byte)69,(byte)78,(byte)68,(byte)36}); // END$
+		os.close();
+		
+		osb.write(new byte[]{(byte)58,(byte)58,(byte)58,(byte)89,(byte)69,(byte)69,(byte)58,(byte)62}); // :::YEE:>
+		
+		byte[] ret = osb.toByteArray();
+
+		ret[lengthIntegerOffset] = (byte)((fileCount >> 24) & 0xFF);
+		ret[lengthIntegerOffset + 1] = (byte)((fileCount >> 16) & 0xFF);
+		ret[lengthIntegerOffset + 2] = (byte)((fileCount >> 8) & 0xFF);
+		ret[lengthIntegerOffset + 3] = (byte)(fileCount & 0xFF);
+		
+		logger.info("Export complete!");
+		
+		EagRuntime.downloadFileWithName(EaglerProfile.getName() + "-backup.epk", ret);
+	}
+
+	private static void exportFileToEPK(String name, byte[] contents, OutputStream os) throws IOException {
+		CRC32 checkSum = new CRC32();
+		checkSum.update(contents);
+		long sum = checkSum.getValue();
+		
+		os.write(new byte[]{(byte)70,(byte)73,(byte)76,(byte)69}); // FILE
+		
+		byte[] nameBytes = name.getBytes(StandardCharsets.UTF_8);
+		os.write(nameBytes.length);
+		os.write(nameBytes);
+		writeInt(contents.length + 5, os);
+		writeInt((int)sum, os);
+		
+		os.write(contents);
+		os.write(':');
+		os.write('>');
+	}
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/ProfileImporter.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/ProfileImporter.java
new file mode 100755
index 0000000..def291f
--- /dev/null
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/ProfileImporter.java
@@ -0,0 +1,151 @@
+package net.lax1dude.eaglercraft.v1_8.profile;
+
+import java.io.IOException;
+
+import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2;
+import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerFolderResourcePack;
+import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayManager;
+import net.lax1dude.eaglercraft.v1_8.sp.server.export.EPKDecompiler;
+import net.lax1dude.eaglercraft.v1_8.sp.server.export.EPKDecompiler.FileEntry;
+import net.lax1dude.eaglercraft.v1_8.update.UpdateService;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ServerList;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class ProfileImporter {
+
+	private static final Logger logger = LogManager.getLogger("ProfileImporter");
+
+	private byte[] data;
+	private EPKDecompiler epkDecompiler;
+	private boolean headerHasProfile;
+	private boolean headerHasSettings;
+	private boolean headerHasServers;
+	private boolean headerHasResourcePacks;
+
+	public ProfileImporter(byte[] data) {
+		this.data = data;
+	}
+
+	public void readHeader() throws IOException {
+		logger.info("Reading EPK file header...");
+		epkDecompiler = new EPKDecompiler(data);
+		
+		FileEntry etr = epkDecompiler.readFile();
+		if (etr == null || !etr.type.equals("HEAD") || !etr.name.equals("file-type")
+				|| !EPKDecompiler.readASCII(etr.data).equals("epk/profile188")) {
+			throw new IOException("EPK file is not a profile backup!");
+		}
+		
+		etr = epkDecompiler.readFile();
+		if (etr == null || !etr.type.equals("HEAD") || !etr.name.equals("file-exports") || etr.data.length != 1) {
+			throw new IOException("EPK file is not a profile backup!");
+		}
+
+		headerHasProfile = (etr.data[0] & 1) != 0;
+		headerHasSettings = (etr.data[0] & 2) != 0;
+		headerHasServers = (etr.data[0] & 4) != 0;
+		headerHasResourcePacks = (etr.data[0] & 8) != 0;
+	}
+
+	public boolean hasProfile() {
+		return headerHasProfile;
+	}
+
+	public boolean hasSettings() {
+		return headerHasSettings;
+	}
+
+	public boolean hasServers() {
+		return headerHasServers;
+	}
+
+	public boolean hasResourcePacks() {
+		return headerHasResourcePacks;
+	}
+
+	/**
+	 * Note: this function is sensitive to the order file appear in the EPK
+	 */
+	public void importProfileAndSettings(boolean doImportProfile, boolean doImportSettings,
+			boolean doImportServers, boolean doImportResourcePacks) throws IOException {
+		doImportProfile &= headerHasProfile;
+		doImportSettings &= headerHasSettings;
+		doImportServers &= headerHasServers;
+		doImportResourcePacks &= headerHasResourcePacks && EaglerFolderResourcePack.isSupported();
+		FileEntry etr;
+		vigg: while((etr = epkDecompiler.readFile()) != null) {
+			if(etr.type.equals("FILE")) {
+				switch(etr.name) {
+				case "_eaglercraftX.p":
+					if(doImportProfile) {
+						logger.info("Importing profile...");
+						EaglerProfile.read(etr.data);
+						EagRuntime.setStorage("p", etr.data);
+					}
+					break;
+				case "_eaglercraftX.g":
+					if(doImportSettings) {
+						logger.info("Importing settings...");
+						Minecraft.getMinecraft().gameSettings.loadOptions(etr.data);
+						EagRuntime.setStorage("g", etr.data);
+					}
+					break;
+				case "_eaglercraftX.r":
+					if(doImportSettings) {
+						logger.info("Importing relays...");
+						RelayManager.relayManager.load(etr.data);
+						EagRuntime.setStorage("r", etr.data);
+					}
+					break;
+				case "_eaglercraftX.s":
+					if(doImportServers) {
+						logger.info("Importing servers...");
+						ServerList.getServerList().loadServerList(etr.data);
+						EagRuntime.setStorage("s", etr.data);
+					}
+					break;
+				default:
+					if(etr.name.startsWith("certs/")) {
+						UpdateService.addCertificateToSet(etr.data);
+					}else if(etr.name.startsWith(EaglerFolderResourcePack.RESOURCE_PACKS + "/")) {
+						if(doImportResourcePacks) {
+							logger.info("Deleting old resource packs...");
+							(new VFile2(EaglerFolderResourcePack.RESOURCE_PACKS)).listFiles(true).forEach(VFile2::delete);
+							logger.info("Importing resource packs...");
+							int counter = 0;
+							do {
+								if(etr.name.startsWith(EaglerFolderResourcePack.RESOURCE_PACKS + "/")) {
+									(new VFile2(etr.name)).setAllBytes(etr.data);
+									if(++counter % 100 == 0) {
+										logger.info("Imported {} files", counter);
+									}
+								}
+							}while((etr = epkDecompiler.readFile()) != null);
+						}
+						break vigg;
+					}
+					break;
+				}
+			}
+		}
+		logger.info("Import complete!");
+	}
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/ConnectionHandshake.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/ConnectionHandshake.java
index 7381110..acedf59 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/ConnectionHandshake.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/ConnectionHandshake.java
@@ -1,6 +1,5 @@
 package net.lax1dude.eaglercraft.v1_8.socket;
 
-import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -8,6 +7,7 @@ import java.nio.charset.StandardCharsets;
 
 import net.lax1dude.eaglercraft.v1_8.ArrayUtils;
 import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
+import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion;
 import net.lax1dude.eaglercraft.v1_8.crypto.SHA256Digest;
@@ -56,7 +56,7 @@ public class ConnectionHandshake {
 		try {
 			pluginVersion = null;
 			pluginBrand = null;
-			ByteArrayOutputStream bao = new ByteArrayOutputStream();
+			EaglerOutputStream bao = new EaglerOutputStream();
 			DataOutputStream d = new DataOutputStream(bao);
 			
 			d.writeByte(HandshakePacketTypes.PROTOCOL_CLIENT_VERSION);
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/EaglercraftNetworkManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/EaglercraftNetworkManager.java
index aa6b602..0e5db53 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/EaglercraftNetworkManager.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/socket/EaglercraftNetworkManager.java
@@ -91,7 +91,8 @@ public class EaglercraftNetworkManager {
 			return;
 		}
 
-		for(byte[] next : pkts) {
+		for(int i = 0, l = pkts.size(); i < l; ++i) {
+			byte[] next = pkts.get(i);
 			++debugPacketCounter;
 			try {
 				ByteBuf nettyBuffer = Unpooled.buffer(next, next.length);
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/SingleplayerServerController.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/SingleplayerServerController.java
index 0c1874a..b658eba 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/SingleplayerServerController.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/SingleplayerServerController.java
@@ -12,17 +12,14 @@ import net.lax1dude.eaglercraft.v1_8.internal.PlatformWebRTC;
 import org.apache.commons.lang3.StringUtils;
 
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
-import net.lax1dude.eaglercraft.v1_8.EaglercraftSoundManager;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumEaglerConnectionState;
 import net.lax1dude.eaglercraft.v1_8.internal.IPCPacketData;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformApplication;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.profile.EaglerProfile;
-import net.lax1dude.eaglercraft.v1_8.socket.EaglercraftNetworkManager;
 import net.lax1dude.eaglercraft.v1_8.sp.internal.ClientPlatformSingleplayer;
 import net.lax1dude.eaglercraft.v1_8.sp.ipc.*;
-import net.lax1dude.eaglercraft.v1_8.sp.lan.LANClientNetworkManager;
 import net.lax1dude.eaglercraft.v1_8.sp.lan.LANServerController;
 import net.lax1dude.eaglercraft.v1_8.sp.socket.ClientIntegratedServerNetworkManager;
 import net.minecraft.client.Minecraft;
@@ -475,7 +472,8 @@ public class SingleplayerServerController implements ISaveFormat {
 	private static void loadSaveComparators() {
 		saveListMap.clear();
 		saveListCache.clear();
-		for(NBTTagCompound nbt : saveListNBT) {
+		for(int j = 0, l = saveListNBT.size(); j < l; ++j) {
+			NBTTagCompound nbt = saveListNBT.get(j);
 			String folderName = nbt.getString("folderNameEagler");
 			if(!StringUtils.isEmpty(folderName)) {
 				WorldInfo worldinfo = new WorldInfo(nbt.getCompoundTag("Data"));
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenBackupWorldSelection.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenBackupWorldSelection.java
index f520dd1..2787d9c 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenBackupWorldSelection.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenBackupWorldSelection.java
@@ -118,7 +118,7 @@ public class GuiScreenBackupWorldSelection extends GuiScreen {
 	public void confirmClicked(boolean par1, int par2) {
 		if(par1) {
 			SingleplayerServerController.clearPlayerData(worldName);
-			this.mc.displayGuiScreen(new GuiScreenIntegratedServerBusy(this, "singleplayer.busy.clearplayers", "singleplayer.failed.clearplayers", () -> SingleplayerServerController.isReady()));
+			this.mc.displayGuiScreen(new GuiScreenIntegratedServerBusy(this, "singleplayer.busy.clearplayers", "singleplayer.failed.clearplayers", SingleplayerServerController::isReady));
 		}else {
 			mc.displayGuiScreen(this);
 		}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenConnectOption.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenConnectOption.java
index 42a0fb9..7fed63f 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenConnectOption.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenConnectOption.java
@@ -46,11 +46,13 @@ public class GuiScreenConnectOption extends GuiScreen {
 
 	protected void actionPerformed(GuiButton par1GuiButton) {
 		if(par1GuiButton.id == 0) {
+			guiScreen.cancelDirectConnect();
 			mc.displayGuiScreen(guiScreen);
 		}else if(par1GuiButton.id == 1) {
 			mc.displayGuiScreen(new GuiScreenServerList(guiScreen, guiScreen.getSelectedServer()));
 		}else if(par1GuiButton.id == 2) {
 			if(LANServerController.supported()) {
+				guiScreen.cancelDirectConnect();
 				mc.displayGuiScreen(GuiScreenLANInfo.showLANInfoScreen(new GuiScreenLANConnect(guiScreen)));
 			}else {
 				mc.displayGuiScreen(new GuiScreenLANNotSupported(this));
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenDemoPlayWorldSelection.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenDemoPlayWorldSelection.java
index 34a1f25..b2aed38 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenDemoPlayWorldSelection.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenDemoPlayWorldSelection.java
@@ -2,7 +2,6 @@ package net.lax1dude.eaglercraft.v1_8.sp.gui;
 
 import net.lax1dude.eaglercraft.v1_8.sp.lan.LANServerController;
 import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiCreateWorld;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.world.demo.DemoWorldServer;
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenNameWorldImport.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenNameWorldImport.java
index f6490fb..f6808e7 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenNameWorldImport.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiScreenNameWorldImport.java
@@ -1,7 +1,5 @@
 package net.lax1dude.eaglercraft.v1_8.sp.gui;
 
-import org.apache.commons.lang3.StringUtils;
-
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
 import net.lax1dude.eaglercraft.v1_8.internal.FileChooserResult;
@@ -61,7 +59,7 @@ public class GuiScreenNameWorldImport extends GuiScreen {
 		if(definetlyTimeToImport && !isImporting) {
 			isImporting = true;
 			SingleplayerServerController.importWorld(GuiCreateWorld.func_146317_a(mc.getSaveLoader(), this.theGuiTextField.getText().trim()), world.fileData, importFormat, (byte) ((loadSpawnChunks ? 2 : 0) | (enhancedGameRules ? 1 : 0)));
-			mc.displayGuiScreen(new GuiScreenIntegratedServerBusy(parentGuiScreen, "singleplayer.busy.importing." + (importFormat + 1), "singleplayer.failed.importing." + (importFormat + 1), () -> SingleplayerServerController.isReady()));
+			mc.displayGuiScreen(new GuiScreenIntegratedServerBusy(parentGuiScreen, "singleplayer.busy.importing." + (importFormat + 1), "singleplayer.failed.importing." + (importFormat + 1), SingleplayerServerController::isReady));
 		}
 	}
 
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiShareToLan.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiShareToLan.java
index b4cfd1b..5c79159 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiShareToLan.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/gui/GuiShareToLan.java
@@ -150,7 +150,7 @@ public class GuiShareToLan extends GuiScreen {
 			}
 			this.mc.displayGuiScreen(null);
 			LoadingScreenRenderer ls = mc.loadingScreen;
-			String code = LANServerController.shareToLAN((str) -> ls.resetProgressAndMessage(str), worldName, hiddenToggle);
+			String code = LANServerController.shareToLAN(ls::resetProgressAndMessage, worldName, hiddenToggle);
 			if (code != null) {
 				SingleplayerServerController.configureLAN(WorldSettings.GameType.getByName(this.gameMode), this.allowCommands);
 				this.mc.ingameGUI.getChatGUI().printChatMessage(new ChatComponentText(I18n.format("lanServer.opened")
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket14StringList.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket14StringList.java
index 0152aa4..16f7f08 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket14StringList.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket14StringList.java
@@ -39,8 +39,8 @@ public class IPCPacket14StringList implements IPCPacketBase {
 	
 	public IPCPacket14StringList(int opcode, String[] list) {
 		stringList = new ArrayList();
-		for(String s : list) {
-			s = s.trim();
+		for(int i = 0; i < list.length; ++i) {
+			String s = list[i].trim();
 			if(s.length() > 0) {
 				stringList.add(s);
 			}
@@ -50,8 +50,8 @@ public class IPCPacket14StringList implements IPCPacketBase {
 	
 	public IPCPacket14StringList(int opcode, List<String> list) {
 		stringList = new ArrayList();
-		for(String s : list) {
-			s = s.trim();
+		for(int i = 0, l = list.size(); i < l; ++i) {
+			String s = list.get(i).trim();
 			if(s.length() > 0) {
 				stringList.add(s);
 			}
@@ -72,9 +72,10 @@ public class IPCPacket14StringList implements IPCPacketBase {
 	@Override
 	public void serialize(DataOutput bin) throws IOException {
 		bin.writeByte(opCode);
-		bin.writeInt(stringList.size());
-		for(String str : stringList) {
-			bin.writeUTF(str);
+		int l = stringList.size();
+		bin.writeInt(l);
+		for(int i = 0; i < l; ++i) {
+			bin.writeUTF(stringList.get(i));
 		}
 	}
 
@@ -86,8 +87,8 @@ public class IPCPacket14StringList implements IPCPacketBase {
 	@Override
 	public int size() {
 		int len = 5;
-		for(String str : stringList) {
-			len += IPCPacketBase.strLen(str);
+		for(int i = 0, l = stringList.size(); i < l; ++i) {
+			len += IPCPacketBase.strLen(stringList.get(i));
 		}
 		return len;
 	}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket15Crashed.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket15Crashed.java
index 60b50c5..9cb5aea 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket15Crashed.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket15Crashed.java
@@ -3,9 +3,6 @@ package net.lax1dude.eaglercraft.v1_8.sp.ipc;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 
 /**
  * Copyright (c) 2023-2024 lax1dude. All Rights Reserved.
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket16NBTList.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket16NBTList.java
index 1248c91..91544a5 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket16NBTList.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacket16NBTList.java
@@ -1,7 +1,5 @@
 package net.lax1dude.eaglercraft.v1_8.sp.ipc;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.DataInput;
 import java.io.DataInputStream;
 import java.io.DataOutput;
@@ -11,6 +9,8 @@ import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
+import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
+import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
 import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
 
@@ -54,7 +54,7 @@ public class IPCPacket16NBTList implements IPCPacketBase {
 		for(int i = 0, size = list.size(); i < size; ++i) {
 			NBTTagCompound tag = list.get(i);
 			try {
-				ByteArrayOutputStream bao = new ByteArrayOutputStream();
+				EaglerOutputStream bao = new EaglerOutputStream();
 				CompressedStreamTools.write(tag, new DataOutputStream(bao));
 				tagList.add(bao.toByteArray());
 			}catch(IOException e) {
@@ -75,7 +75,7 @@ public class IPCPacket16NBTList implements IPCPacketBase {
 			bin.readFully(toRead);
 			tagList.add(toRead);
 			try {
-				nbtTagList.add(CompressedStreamTools.read(new DataInputStream(new ByteArrayInputStream(toRead))));
+				nbtTagList.add(CompressedStreamTools.read(new DataInputStream(new EaglerInputStream(toRead))));
 			}catch(IOException e) {
 				System.err.println("Failed to read tag #" + i + " in IPCPacket16NBTList");
 			}
@@ -85,8 +85,10 @@ public class IPCPacket16NBTList implements IPCPacketBase {
 	@Override
 	public void serialize(DataOutput bin) throws IOException {
 		bin.writeInt(opCode);
-		bin.writeInt(tagList.size());
-		for(byte[] str : tagList) {
+		int l = tagList.size();
+		bin.writeInt(l);
+		for(int i = 0; i < l; ++i) {
+			byte[] str = tagList.get(i);
 			bin.writeInt(str.length);
 			bin.write(str);
 		}
@@ -100,9 +102,9 @@ public class IPCPacket16NBTList implements IPCPacketBase {
 	@Override
 	public int size() {
 		int len = 8;
-		for(byte[] str : tagList) {
+		for(int i = 0, l = tagList.size(); i < l; ++i) {
 			len += 4;
-			len += str.length;
+			len += tagList.get(i).length;
 		}
 		return len;
 	}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacketManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacketManager.java
index d0bd108..65a9539 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacketManager.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/ipc/IPCPacketManager.java
@@ -32,32 +32,32 @@ public class IPCPacketManager {
 	public static final DataOutputStream IPC_DATA_OUTPUT_STREAM = new DataOutputStream(IPC_OUTPUT_STREAM);
 	
 	static {
-		mappings.put(IPCPacket00StartServer.ID, () -> new IPCPacket00StartServer());
-		mappings.put(IPCPacket01StopServer.ID, () -> new IPCPacket01StopServer());
-		mappings.put(IPCPacket02InitWorld.ID, () -> new IPCPacket02InitWorld());
-		mappings.put(IPCPacket03DeleteWorld.ID, () -> new IPCPacket03DeleteWorld());
-		mappings.put(IPCPacket05RequestData.ID, () -> new IPCPacket05RequestData());
-		mappings.put(IPCPacket06RenameWorldNBT.ID, () -> new IPCPacket06RenameWorldNBT());
-		mappings.put(IPCPacket07ImportWorld.ID, () -> new IPCPacket07ImportWorld());
-		mappings.put(IPCPacket09RequestResponse.ID, () -> new IPCPacket09RequestResponse());
-		mappings.put(IPCPacket0ASetWorldDifficulty.ID, () -> new IPCPacket0ASetWorldDifficulty());
-		mappings.put(IPCPacket0BPause.ID, () -> new IPCPacket0BPause());
-		mappings.put(IPCPacket0CPlayerChannel.ID, () -> new IPCPacket0CPlayerChannel());
-		mappings.put(IPCPacket0DProgressUpdate.ID, () -> new IPCPacket0DProgressUpdate());
-		mappings.put(IPCPacket0EListWorlds.ID, () -> new IPCPacket0EListWorlds());
-		mappings.put(IPCPacket0FListFiles.ID, () -> new IPCPacket0FListFiles());
-		mappings.put(IPCPacket10FileRead.ID, () -> new IPCPacket10FileRead());
-		mappings.put(IPCPacket12FileWrite.ID, () -> new IPCPacket12FileWrite());
-		mappings.put(IPCPacket13FileCopyMove.ID, () -> new IPCPacket13FileCopyMove());
-		mappings.put(IPCPacket14StringList.ID, () -> new IPCPacket14StringList());
-		mappings.put(IPCPacket15Crashed.ID, () -> new IPCPacket15Crashed());
-		mappings.put(IPCPacket16NBTList.ID, () -> new IPCPacket16NBTList());
-		mappings.put(IPCPacket17ConfigureLAN.ID, () -> new IPCPacket17ConfigureLAN());
-		mappings.put(IPCPacket18ClearPlayers.ID, () -> new IPCPacket18ClearPlayers());
-		mappings.put(IPCPacket19Autosave.ID, () -> new IPCPacket19Autosave());
-		mappings.put(IPCPacket20LoggerMessage.ID, () -> new IPCPacket20LoggerMessage());
-		mappings.put(IPCPacket21EnableLogging.ID, () -> new IPCPacket21EnableLogging());
-		mappings.put(IPCPacketFFProcessKeepAlive.ID, () -> new IPCPacketFFProcessKeepAlive());
+		mappings.put(IPCPacket00StartServer.ID, IPCPacket00StartServer::new);
+		mappings.put(IPCPacket01StopServer.ID, IPCPacket01StopServer::new);
+		mappings.put(IPCPacket02InitWorld.ID, IPCPacket02InitWorld::new);
+		mappings.put(IPCPacket03DeleteWorld.ID, IPCPacket03DeleteWorld::new);
+		mappings.put(IPCPacket05RequestData.ID, IPCPacket05RequestData::new);
+		mappings.put(IPCPacket06RenameWorldNBT.ID, IPCPacket06RenameWorldNBT::new);
+		mappings.put(IPCPacket07ImportWorld.ID, IPCPacket07ImportWorld::new);
+		mappings.put(IPCPacket09RequestResponse.ID, IPCPacket09RequestResponse::new);
+		mappings.put(IPCPacket0ASetWorldDifficulty.ID, IPCPacket0ASetWorldDifficulty::new);
+		mappings.put(IPCPacket0BPause.ID, IPCPacket0BPause::new);
+		mappings.put(IPCPacket0CPlayerChannel.ID, IPCPacket0CPlayerChannel::new);
+		mappings.put(IPCPacket0DProgressUpdate.ID, IPCPacket0DProgressUpdate::new);
+		mappings.put(IPCPacket0EListWorlds.ID, IPCPacket0EListWorlds::new);
+		mappings.put(IPCPacket0FListFiles.ID, IPCPacket0FListFiles::new);
+		mappings.put(IPCPacket10FileRead.ID, IPCPacket10FileRead::new);
+		mappings.put(IPCPacket12FileWrite.ID, IPCPacket12FileWrite::new);
+		mappings.put(IPCPacket13FileCopyMove.ID, IPCPacket13FileCopyMove::new);
+		mappings.put(IPCPacket14StringList.ID, IPCPacket14StringList::new);
+		mappings.put(IPCPacket15Crashed.ID, IPCPacket15Crashed::new);
+		mappings.put(IPCPacket16NBTList.ID, IPCPacket16NBTList::new);
+		mappings.put(IPCPacket17ConfigureLAN.ID, IPCPacket17ConfigureLAN::new);
+		mappings.put(IPCPacket18ClearPlayers.ID, IPCPacket18ClearPlayers::new);
+		mappings.put(IPCPacket19Autosave.ID, IPCPacket19Autosave::new);
+		mappings.put(IPCPacket20LoggerMessage.ID, IPCPacket20LoggerMessage::new);
+		mappings.put(IPCPacket21EnableLogging.ID, IPCPacket21EnableLogging::new);
+		mappings.put(IPCPacketFFProcessKeepAlive.ID, IPCPacketFFProcessKeepAlive::new);
 	}
 	
 	public static byte[] IPCSerialize(IPCPacketBase pkt) throws IOException {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANClientNetworkManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANClientNetworkManager.java
index 6bf843b..49c4aa1 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANClientNetworkManager.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/lan/LANClientNetworkManager.java
@@ -1,7 +1,9 @@
 package net.lax1dude.eaglercraft.v1_8.sp.lan;
 
 import net.lax1dude.eaglercraft.v1_8.EagUtils;
+import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
 import net.lax1dude.eaglercraft.v1_8.EaglerZLIB;
+import net.lax1dude.eaglercraft.v1_8.IOUtils;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumEaglerConnectionState;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformWebRTC;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
@@ -17,7 +19,6 @@ import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.ChatComponentTranslation;
 import net.minecraft.util.IChatComponent;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -299,7 +300,8 @@ public class LANClientNetworkManager extends EaglercraftNetworkManager {
 			if(packets == null) {
 				return;
 			}
-			for(byte[] data : packets) {
+			for(int k = 0, l = packets.size(); k < l; ++k) {
+				byte[] data = packets.get(k);
 				byte[] fullData;
 				boolean compressed = false;
 
@@ -336,11 +338,14 @@ public class LANClientNetworkManager extends EaglercraftNetworkManager {
 					if(fullData.length < 4) {
 						throw new IOException("Recieved invalid " + fullData.length + " byte compressed packet");
 					}
-					ByteArrayInputStream bi = new ByteArrayInputStream(fullData);
+					EaglerInputStream bi = new EaglerInputStream(fullData);
 					int i = (bi.read() << 24) | (bi.read() << 16) | (bi.read() << 8) | bi.read();
 					InputStream inflaterInputStream = EaglerZLIB.newInflaterInputStream(bi);
 					fullData = new byte[i];
-					inflaterInputStream.read(fullData);
+					int r = IOUtils.readFully(inflaterInputStream, fullData);
+					if (i != r) {
+						logger.warn("Decompressed packet expected size {} differs from actual size {}!", i, r);
+					}
 				}
 
 				if(firstPacket) {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayManager.java
index 3ad56d6..8f3346c 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayManager.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/RelayManager.java
@@ -1,6 +1,6 @@
 package net.lax1dude.eaglercraft.v1_8.sp.relay;
 
-import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -9,6 +9,9 @@ import java.util.function.Consumer;
 
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EagUtils;
+import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
+import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
+import net.lax1dude.eaglercraft.v1_8.ThreadLocalRandom;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.sp.relay.pkt.IPacket;
@@ -42,8 +45,46 @@ public class RelayManager {
 	
 	private final List<RelayServer> relays = new ArrayList();
 	private long lastPingThrough = 0l;
-	
-	public void load(NBTTagList relayConfig) {
+
+	public void load(byte[] relayConfig) {
+		NBTTagCompound relays = null;
+		if(relayConfig != null) {
+			try {
+				relays = CompressedStreamTools.readCompressed(new EaglerInputStream(relayConfig));
+			} catch (IOException ex) {
+			}
+		}
+		if(relays != null && relays.hasKey("relays", 9)) {
+			load(relays.getTagList("relays", 10));
+			if(!relays.getBoolean("f")) {
+				fixBullshit();
+			}
+		}else {
+			sort(); // loads defaults
+			save();
+		}
+	}
+
+	// versions pre-u24 always have "relay.deev.is" as primary due to a glitch
+	// this function is intended to randomize the list if that is detected
+	private void fixBullshit() {
+		if(!relays.isEmpty()) {
+			for(int i = 0, l = relays.size(); i < l; ++i) {
+				RelayServer rs = relays.get(i);
+				if(rs.address.equalsIgnoreCase("wss://relay.deev.is/") && !rs.isPrimary()) {
+					return;
+				}
+			}
+			for(int i = 0, l = relays.size(); i < l; ++i) {
+				relays.get(i).setPrimary(false);
+			}
+			relays.get(ThreadLocalRandom.current().nextInt(relays.size())).setPrimary(true);
+			sort();
+			save();
+		}
+	}
+
+	private void load(NBTTagList relayConfig) {
 		relays.clear();
 		if(relayConfig != null && relayConfig.tagCount() > 0) {
 			boolean gotAPrimary = false;
@@ -64,6 +105,16 @@ public class RelayManager {
 	}
 	
 	public void save() {
+		if(relays.isEmpty()) {
+			return;
+		}
+		byte[] data = write();
+		if(data != null) {
+			EagRuntime.setStorage("r", data);
+		}
+	}
+	
+	public byte[] write() {
 		try {
 			NBTTagList lst = new NBTTagList();
 			for(int i = 0, l = relays.size(); i < l; ++i) {
@@ -77,17 +128,25 @@ public class RelayManager {
 
 			NBTTagCompound nbttagcompound = new NBTTagCompound();
 			nbttagcompound.setTag("relays", lst);
+			nbttagcompound.setBoolean("f", true);
 
-			ByteArrayOutputStream bao = new ByteArrayOutputStream();
+			EaglerOutputStream bao = new EaglerOutputStream();
 			CompressedStreamTools.writeCompressed(nbttagcompound, bao);
-			EagRuntime.setStorage("r", bao.toByteArray());
+			return bao.toByteArray();
 		} catch (Exception exception) {
 			logger.error("Couldn\'t save relay list!");
 			logger.error(exception);
+			return null;
 		}
 	}
 	
 	private void sort() {
+		if(relays.isEmpty()) {
+			List<RelayEntry> defaultRelays = EagRuntime.getConfiguration().getRelays();
+			for(int i = 0, l = defaultRelays.size(); i < l; ++i) {
+				relays.add(new RelayServer(defaultRelays.get(i)));
+			}
+		}
 		if(relays.isEmpty()) {
 			return;
 		}
@@ -315,16 +374,17 @@ public class RelayManager {
 	}
 	
 	public void loadDefaults() {
-		int setPrimary = relays.size();
-		eee: for(RelayEntry etr : EagRuntime.getConfiguration().getRelays()) {
-			for(RelayServer exEtr : relays) {
-				if(exEtr.address.equalsIgnoreCase(etr.address)) {
+		List<RelayEntry> defaultRelays = EagRuntime.getConfiguration().getRelays();
+		eee: for(int i = 0, l = defaultRelays.size(); i < l; ++i) {
+			RelayEntry etr = defaultRelays.get(i);
+			for(int j = 0, l2 = relays.size(); j < l2; ++j) {
+				if(relays.get(j).address.equalsIgnoreCase(etr.address)) {
 					continue eee;
 				}
 			}
 			relays.add(new RelayServer(etr));
 		}
-		setPrimary(setPrimary);
+		sort();
 	}
 	
 	public String makeNewRelayName() {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket.java
index 95512e9..b7cfcd9 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/relay/pkt/IPacket.java
@@ -1,6 +1,5 @@
 package net.lax1dude.eaglercraft.v1_8.sp.relay.pkt;
 
-import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -9,6 +8,7 @@ import java.io.OutputStream;
 import java.util.HashMap;
 import java.util.Map;
 
+import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
@@ -73,8 +73,8 @@ public class IPacket {
 		Integer i = definedPacketIds.get(packet.getClass());
 		if(i != null) {
 			int len = packet.packetLength();
-			ByteArrayOutputStream bao = len == -1 ? new ByteArrayOutputStream() :
-				new ByteArrayOutputStream(len + 1);
+			EaglerOutputStream bao = len == -1 ? new EaglerOutputStream() :
+				new EaglerOutputStream(len + 1);
 			bao.write(i);
 			packet.write(new DataOutputStream(bao));
 			byte[] ret = bao.toByteArray();
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerIntegratedServerWorker.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerIntegratedServerWorker.java
index 7676016..3d55e43 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerIntegratedServerWorker.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerIntegratedServerWorker.java
@@ -88,8 +88,8 @@ public class EaglerIntegratedServerWorker {
 
 	public static void tick() {
 		List<IntegratedServerPlayerNetworkManager> ocs = new ArrayList<>(openChannels.values());
-		for(IntegratedServerPlayerNetworkManager i : ocs) {
-			i.tick();
+		for(int i = 0, l = ocs.size(); i < l; ++i) {
+			ocs.get(i).tick();
 		}
 	}
 
@@ -147,8 +147,8 @@ public class EaglerIntegratedServerWorker {
 					EaglerSaveFormat.worldsList.setAllChars(pkt.worldName);
 				}else {
 					boolean found = false;
-					for(String s : worlds) {
-						if(s.equals(pkt.worldName)) {
+					for(int i = 0; i < worlds.length; ++i) {
+						if(worlds[i].equals(pkt.worldName)) {
 							found = true;
 							break;
 						}
@@ -196,7 +196,8 @@ public class EaglerIntegratedServerWorker {
 				String[] worldsTxt = EaglerSaveFormat.worldsList.getAllLines();
 				if(worldsTxt != null) {
 					List<String> newWorlds = new ArrayList();
-					for(String str : worldsTxt) {
+					for(int i = 0; i < worldsTxt.length; ++i) {
+						String str = worldsTxt[i];
 						if(!str.equalsIgnoreCase(pkt.worldName)) {
 							newWorlds.add(str);
 						}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerSaveFormat.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerSaveFormat.java
index 4f7afa8..3d31901 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerSaveFormat.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerSaveFormat.java
@@ -90,7 +90,9 @@ public class EaglerSaveFormat extends SaveFormatOld {
 		int totalSize = 0;
 		int lastUpdate = 0;
 		final VFile2 finalNewFolder = newFolder;
-		for(VFile2 vf : oldFolder.listFiles(true)) {
+		List<VFile2> vfl = oldFolder.listFiles(true);
+		for(int i = 0, l = vfl.size(); i < l; ++i) {
+			VFile2 vf = vfl.get(i);
 			String fileNameRelative = vf.getPath().substring(oldPath.length() + 1);
 			totalSize += VFile2.copyFile(vf, new VFile2(finalNewFolder, fileNameRelative));
 			if (totalSize - lastUpdate > 10000) {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/EPKCompiler.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/EPKCompiler.java
index 662f4bc..c55032f 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/EPKCompiler.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/EPKCompiler.java
@@ -1,6 +1,5 @@
 package net.lax1dude.eaglercraft.v1_8.sp.server.export;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
@@ -9,6 +8,7 @@ import java.util.Date;
 import java.util.zip.CRC32;
 
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
 
 /**
  * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
@@ -27,13 +27,13 @@ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
  */
 public class EPKCompiler {
 
-	private final ByteArrayOutputStream os;
+	private final EaglerOutputStream os;
 	private final CRC32 checkSum = new CRC32();
 	private int lengthIntegerOffset = 0;
 	private int totalFileCount = 0;
 
 	public EPKCompiler(String name, String owner, String type) {
-		os = new ByteArrayOutputStream(0x200000);
+		os = new EaglerOutputStream(0x200000);
 		try {
 			
 			os.write(new byte[]{(byte)69,(byte)65,(byte)71,(byte)80,(byte)75,(byte)71,(byte)36,(byte)36}); // EAGPKG$$
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/EPKDecompiler.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/EPKDecompiler.java
index 0e73bde..ad08945 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/EPKDecompiler.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/EPKDecompiler.java
@@ -7,6 +7,7 @@ import java.util.Arrays;
 import java.util.zip.CRC32;
 
 import net.lax1dude.eaglercraft.v1_8.EaglerZLIB;
+import net.lax1dude.eaglercraft.v1_8.IOUtils;
 
 /**
  * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
@@ -46,7 +47,7 @@ public class EPKDecompiler {
 		in2 = new ByteArrayInputStream(data);
 		
 		byte[] header = new byte[8];
-		in2.read(header);
+		IOUtils.readFully(in2, header);
 		
 		if(Arrays.equals(header, new byte[]{(byte)69,(byte)65,(byte)71,(byte)80,(byte)75,(byte)71,(byte)36,(byte)36})) {
 			byte[] endCode = new byte[] { (byte)':', (byte)':', (byte)':', (byte)'Y',
@@ -63,10 +64,10 @@ public class EPKDecompiler {
 			if(!vers.startsWith("ver2.")) {
 				throw new IOException("Unknown or invalid EPK version: " + vers);
 			}
-			
-			is.skip(is.read()); // skip filename
-			is.skip(loadShort(is)); // skip comment
-			is.skip(8); // skip millis date
+
+			IOUtils.skipFully(is, is.read()); // skip filename
+			IOUtils.skipFully(is, loadShort(is)); // skip comment
+			IOUtils.skipFully(is, 8); // skip millis date
 			
 			numFiles = loadInt(is);
 			
@@ -101,7 +102,7 @@ public class EPKDecompiler {
 		}
 		
 		byte[] typeBytes = new byte[4];
-		zis.read(typeBytes);
+		IOUtils.readFully(zis, typeBytes);
 		String type = readASCII(typeBytes);
 		
 		if(numFiles == 0) {
@@ -126,7 +127,7 @@ public class EPKDecompiler {
 					int loadedCrc = loadInt(zis);
 					
 					data = new byte[len - 5];
-					zis.read(data);
+					IOUtils.readFully(zis, data);
 					
 					crc32.reset();
 					crc32.update(data, 0, data.length);
@@ -139,7 +140,7 @@ public class EPKDecompiler {
 					}
 				}else {
 					data = new byte[len];
-					zis.read(data);
+					IOUtils.readFully(zis, data);
 				}
 				
 				if(zis.read() != '>') {
@@ -152,11 +153,11 @@ public class EPKDecompiler {
 		}
 	}
 	
-	private static final int loadShort(InputStream is) throws IOException {
+	public static final int loadShort(InputStream is) throws IOException {
 		return (is.read() << 8) | is.read();
 	}
 	
-	private static final int loadInt(InputStream is) throws IOException {
+	public static final int loadInt(InputStream is) throws IOException {
 		return (is.read() << 24) | (is.read() << 16) | (is.read() << 8) | is.read();
 	}
 	
@@ -168,7 +169,7 @@ public class EPKDecompiler {
 		return new String(charIn);
 	}
 	
-	private static final String readASCII(InputStream bytesIn) throws IOException {
+	public static final String readASCII(InputStream bytesIn) throws IOException {
 		int len = bytesIn.read();
 		char[] charIn = new char[len];
 		for(int i = 0; i < len; ++i) {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/WorldConverterEPK.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/WorldConverterEPK.java
index 5562581..2ad3c5d 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/WorldConverterEPK.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/WorldConverterEPK.java
@@ -1,9 +1,10 @@
 package net.lax1dude.eaglercraft.v1_8.sp.server.export;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.List;
 
+import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
+import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
 import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
@@ -62,10 +63,10 @@ public class WorldConverterEPK {
 			}
 			if(f.type.equals("FILE")) {
 				if(f.name.equals("level.dat") || f.name.equals("level.dat_old")) {
-					NBTTagCompound worldDatNBT = CompressedStreamTools.readCompressed(new ByteArrayInputStream(b));
+					NBTTagCompound worldDatNBT = CompressedStreamTools.readCompressed(new EaglerInputStream(b));
 					worldDatNBT.getCompoundTag("Data").setString("LevelName", newName);
 					worldDatNBT.getCompoundTag("Data").setLong("LastPlayed", System.currentTimeMillis());
-					ByteArrayOutputStream tmp = new ByteArrayOutputStream();
+					EaglerOutputStream tmp = new EaglerOutputStream();
 					CompressedStreamTools.writeCompressed(worldDatNBT, tmp);
 					b = tmp.toByteArray();
 				}
@@ -109,7 +110,9 @@ public class WorldConverterEPK {
 		final int[] lastUpdate = new int[1];
 		EPKCompiler c = new EPKCompiler(realWorldName, worldOwner, "epk/world188");
 		String pfx = worldDir.getPath();
-		for(VFile2 vf : worldDir.listFiles(true)) {
+		List<VFile2> filesList = worldDir.listFiles(true);
+		for(int i = 0, l = filesList.size(); i < l; ++i) {
+			VFile2 vf = filesList.get(i);
 			++filesWritten[0];
 			byte[] b = vf.getAllBytes();
 			c.append(vf.getPath().substring(pfx.length() + 1), b);
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/WorldConverterMCA.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/WorldConverterMCA.java
index 4143440..75b0641 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/WorldConverterMCA.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/WorldConverterMCA.java
@@ -1,7 +1,5 @@
 package net.lax1dude.eaglercraft.v1_8.sp.server.export;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -13,6 +11,8 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 
+import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
+import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
 import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
@@ -50,7 +50,7 @@ public class WorldConverterMCA {
 			folderName += "_";
 			worldDir = EaglerIntegratedServerWorker.saveFormat.getSaveLoader(folderName, false).getWorldDirectory();
 		}
-		ZipInputStream zis = new ZipInputStream(new ByteArrayInputStream(archiveContents));
+		ZipInputStream zis = new ZipInputStream(new EaglerInputStream(archiveContents));
 		ZipEntry folderNameFile = null;
 		List<char[]> fileNames = new ArrayList<>();
 		while((folderNameFile = zis.getNextEntry()) != null) {
@@ -63,7 +63,7 @@ public class WorldConverterMCA {
 		final int[] i = new int[] { 0 };
 		while(fileNames.get(0).length > i[0] && fileNames.stream().allMatch(w -> w[i[0]] == fileNames.get(0)[i[0]])) i[0]++;
 		int folderPrefixOffset = i[0];
-		zis = new ZipInputStream(new ByteArrayInputStream(archiveContents));
+		zis = new ZipInputStream(new EaglerInputStream(archiveContents));
 		ZipEntry f = null;
 		int lastProgUpdate = 0;
 		int prog = 0;
@@ -73,7 +73,7 @@ public class WorldConverterMCA {
 			if (f.isDirectory()) continue;
 			String lowerName = f.getName().toLowerCase();
 			if (!(lowerName.endsWith(".dat") || lowerName.endsWith(".dat_old") || lowerName.endsWith(".mca") || lowerName.endsWith(".mcr") || lowerName.endsWith(".bmp"))) continue;
-			ByteArrayOutputStream baos = new ByteArrayOutputStream();
+			EaglerOutputStream baos = new EaglerOutputStream();
 			int len;
 			while ((len = zis.read(bb)) != -1) {
 				baos.write(bb, 0, len);
@@ -82,7 +82,7 @@ public class WorldConverterMCA {
 			byte[] b = baos.toByteArray();
 			String fileName = f.getName().substring(folderPrefixOffset);
 			if (fileName.equals("level.dat") || fileName.equals("level.dat_old")) {
-				NBTTagCompound worldDatNBT = CompressedStreamTools.readCompressed(new ByteArrayInputStream(b));
+				NBTTagCompound worldDatNBT = CompressedStreamTools.readCompressed(new EaglerInputStream(b));
 
 				NBTTagCompound gameRulesNBT = worldDatNBT.getCompoundTag("Data").getCompoundTag("GameRules");
 				gameRulesNBT.setString("loadSpawnChunks", (gameRules & 2) != 0 ? "true" : "false");
@@ -96,7 +96,7 @@ public class WorldConverterMCA {
 
 				worldDatNBT.getCompoundTag("Data").setString("LevelName", newName);
 				worldDatNBT.getCompoundTag("Data").setLong("LastPlayed", System.currentTimeMillis());
-				ByteArrayOutputStream bo = new ByteArrayOutputStream();
+				EaglerOutputStream bo = new EaglerOutputStream();
 				CompressedStreamTools.writeCompressed(worldDatNBT, bo);
 				b = bo.toByteArray();
 				VFile2 ff = new VFile2(worldDir, fileName);
@@ -129,7 +129,7 @@ public class WorldConverterMCA {
 								logger.error("{}: Chunk already exists: {}", fileName, chunkOut.getPath());
 								continue;
 							}
-							ByteArrayOutputStream bao = new ByteArrayOutputStream();
+							EaglerOutputStream bao = new EaglerOutputStream();
 							CompressedStreamTools.writeCompressed(chunkNBT, bao);
 							b = bao.toByteArray();
 							chunkOut.setAllBytes(b);
@@ -171,7 +171,7 @@ public class WorldConverterMCA {
 	}
 
 	public static byte[] exportWorld(String folderName) throws IOException {
-		ByteArrayOutputStream bao = new ByteArrayOutputStream();
+		EaglerOutputStream bao = new EaglerOutputStream();
 		ZipOutputStream zos = new ZipOutputStream(bao);
 		zos.setComment("contains backup of world '" + folderName + "'");
 		VFile2 worldFolder = EaglerIntegratedServerWorker.saveFormat.getSaveLoader(folderName, false).getWorldDirectory();
@@ -209,12 +209,13 @@ public class WorldConverterMCA {
 			String regionFolder = folderName + dstFolderNames[i];
 			logger.info("Converting chunks in \"{}\" as MCA to \"{}\"...", vf.getPath(), regionFolder);
 			Map<String,RegionFile> regionFiles = new HashMap();
-			for(VFile2 chunkFile : fileList) {
+			for(int k = 0, l = fileList.size(); k < l; ++k) {
+				VFile2 chunkFile = fileList.get(k);
 				NBTTagCompound chunkNBT;
 				NBTTagCompound chunkLevel;
 				try {
 					b = chunkFile.getAllBytes();
-					chunkNBT = CompressedStreamTools.readCompressed(new ByteArrayInputStream(b));
+					chunkNBT = CompressedStreamTools.readCompressed(new EaglerInputStream(b));
 					if(!chunkNBT.hasKey("Level", 10)) {
 						throw new IOException("Chunk is missing level data!");
 					}
@@ -258,7 +259,8 @@ public class WorldConverterMCA {
 		}
 		logger.info("Copying extra world data...");
 		fileList = (new VFile2(worldFolder, "data")).listFiles(false);
-		for(VFile2 dataFile : fileList) {
+		for(int k = 0, l = fileList.size(); k < l; ++k) {
+			VFile2 dataFile = fileList.get(k);
 			zos.putNextEntry(new ZipEntry(folderName + "/data/" + dataFile.getName()));
 			b = dataFile.getAllBytes();
 			zos.write(b);
@@ -269,7 +271,8 @@ public class WorldConverterMCA {
 			}
 		}
 		fileList = (new VFile2(worldFolder, "players")).listFiles(false);
-		for(VFile2 dataFile : fileList) {
+		for(int k = 0, l = fileList.size(); k < l; ++k) {
+			VFile2 dataFile = fileList.get(k);
 			zos.putNextEntry(new ZipEntry(folderName + "/players/" + dataFile.getName()));
 			b = dataFile.getAllBytes();
 			zos.write(b);
@@ -280,7 +283,8 @@ public class WorldConverterMCA {
 			}
 		}
 		fileList = (new VFile2(worldFolder, "eagler/skulls")).listFiles(false);
-		for(VFile2 dataFile : fileList) {
+		for(int k = 0, l = fileList.size(); k < l; ++k) {
+			VFile2 dataFile = fileList.get(k);
 			zos.putNextEntry(new ZipEntry(folderName + "/eagler/skulls/" + dataFile.getName()));
 			b = dataFile.getAllBytes();
 			zos.write(b);
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/IntegratedServerPlayerNetworkManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/IntegratedServerPlayerNetworkManager.java
index 38e97b9..80ae085 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/IntegratedServerPlayerNetworkManager.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/IntegratedServerPlayerNetworkManager.java
@@ -1,12 +1,12 @@
 package net.lax1dude.eaglercraft.v1_8.sp.server.socket;
 
-import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
 
+import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
 import net.lax1dude.eaglercraft.v1_8.EaglerZLIB;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumEaglerConnectionState;
 import net.lax1dude.eaglercraft.v1_8.internal.IPCPacketData;
@@ -48,7 +48,7 @@ public class IntegratedServerPlayerNetworkManager {
 	public final String playerChannel;
 	private EnumConnectionState packetState = EnumConnectionState.HANDSHAKING;
 	private static PacketBuffer temporaryBuffer;
-	private static ByteArrayOutputStream temporaryOutputStream;
+	private static EaglerOutputStream temporaryOutputStream;
 	private int debugPacketCounter = 0;
 	private byte[][] recievedPacketBuffer = new byte[16384][];
 	private int recievedPacketBufferCounter = 0;
@@ -71,7 +71,7 @@ public class IntegratedServerPlayerNetworkManager {
 		this.enableSendCompression = !SingleplayerServerController.PLAYER_CHANNEL.equals(playerChannel);
 		if(this.enableSendCompression) {
 			if(temporaryOutputStream == null) {
-				temporaryOutputStream = new ByteArrayOutputStream(16386);
+				temporaryOutputStream = new EaglerOutputStream(16386);
 			}
 		}
 	}
@@ -115,7 +115,7 @@ public class IntegratedServerPlayerNetworkManager {
 			if(enableSendCompression) {
 				if(firstPacket) {
 					if(data.length > 2 && data[0] == (byte)0x02 && data[1] == (byte)0x3D) {
-						ByteArrayOutputStream kickPacketBAO = new ByteArrayOutputStream();
+						EaglerOutputStream kickPacketBAO = new EaglerOutputStream();
 						try {
 							DataOutputStream kickDAO = new DataOutputStream(kickPacketBAO);
 							kickDAO.write(0);
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/socket/ClientIntegratedServerNetworkManager.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/socket/ClientIntegratedServerNetworkManager.java
index 556a5a1..b5373d3 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/socket/ClientIntegratedServerNetworkManager.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/sp/socket/ClientIntegratedServerNetworkManager.java
@@ -10,7 +10,6 @@ import net.lax1dude.eaglercraft.v1_8.socket.EaglercraftNetworkManager;
 import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController;
 import net.lax1dude.eaglercraft.v1_8.sp.internal.ClientPlatformSingleplayer;
 import net.lax1dude.eaglercraft.v1_8.sp.lan.LANServerController;
-import net.minecraft.network.EnumConnectionState;
 import net.minecraft.network.EnumPacketDirection;
 import net.minecraft.network.Packet;
 import net.minecraft.network.PacketBuffer;
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateCheckerOverlay.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateCheckerOverlay.java
index 70c2543..6ab1a82 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateCheckerOverlay.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateCheckerOverlay.java
@@ -1,6 +1,5 @@
 package net.lax1dude.eaglercraft.v1_8.update;
 
-import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.sp.lan.LANServerController;
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateVersionList.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateVersionList.java
index e1cf856..6943d87 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateVersionList.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateVersionList.java
@@ -1,8 +1,6 @@
 package net.lax1dude.eaglercraft.v1_8.update;
 
 import java.io.IOException;
-import java.util.List;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/update/RelayUpdateChecker.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/update/RelayUpdateChecker.java
index 56cd0e7..caacd61 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/update/RelayUpdateChecker.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/update/RelayUpdateChecker.java
@@ -1,7 +1,5 @@
 package net.lax1dude.eaglercraft.v1_8.update;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -9,6 +7,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
+import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformApplication;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformWebRTC;
 import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayManager;
@@ -67,7 +67,7 @@ public class RelayUpdateChecker {
 			byte[] b = PlatformApplication.getLocalStorage("lastRelayUpdate");
 			if(b != null) {
 				try {
-					lastUpdateCheck = (new DataInputStream(new ByteArrayInputStream(b))).readLong();
+					lastUpdateCheck = (new DataInputStream(new EaglerInputStream(b))).readLong();
 				} catch (IOException e) {
 				}
 			}
@@ -77,7 +77,7 @@ public class RelayUpdateChecker {
 		if((mc.theWorld == null || mc.isSingleplayer()) && millis - lastUpdateCheck > updateCheckRate) {
 			lastUpdateCheck = millis;
 			try {
-				ByteArrayOutputStream bao = new ByteArrayOutputStream(8);
+				EaglerOutputStream bao = new EaglerOutputStream(8);
 				(new DataOutputStream(bao)).writeLong(lastUpdateCheck);
 				PlatformApplication.setLocalStorage("lastRelayUpdate", bao.toByteArray());
 			} catch (IOException e) {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/update/UpdateCertificate.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/update/UpdateCertificate.java
index e101222..63df0b0 100755
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/update/UpdateCertificate.java
+++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/update/UpdateCertificate.java
@@ -1,6 +1,5 @@
 package net.lax1dude.eaglercraft.v1_8.update;
 
-import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -11,8 +10,10 @@ import java.util.Objects;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.MultimapBuilder.ListMultimapBuilder;
 
+import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
 import net.lax1dude.eaglercraft.v1_8.EaglerZLIB;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion;
+import net.lax1dude.eaglercraft.v1_8.IOUtils;
 import net.lax1dude.eaglercraft.v1_8.crypto.SHA256Digest;
 
 /**
@@ -78,7 +79,7 @@ public class UpdateCertificate {
 	public final DLSource[] bundleDataSources;
 
 	public static UpdateCertificate parseAndVerifyCertificate(byte[] certData) throws IOException, CertificateInvalidException {
-		InputStream is = new ByteArrayInputStream(certData);
+		InputStream is = new EaglerInputStream(certData);
 		if(is.read() != 'E' || is.read() != 'A' || is.read() != 'G' || is.read() != 'S' || is.read() != 'I' || is.read() != 'G') {
 			throw new IOException("Data is not a certificate!");
 		}
@@ -90,7 +91,7 @@ public class UpdateCertificate {
 		}
 		
 		byte[] rsa2048sum = new byte[256];
-		is.read(rsa2048sum);
+		IOUtils.readFully(is, rsa2048sum);
 		
 		byte[] rsa2048sumDec = (new BigInteger(rsa2048sum)).modPow(new BigInteger("65537"), EaglercraftVersion.updateSignatureModulus).toByteArray();
 		
@@ -108,7 +109,7 @@ public class UpdateCertificate {
 		payloadLen |= is.read();
 		
 		byte[] signaturePayload = new byte[payloadLen];
-		is.read(signaturePayload);
+		IOUtils.readFully(is, signaturePayload);
 		
 		SHA256Digest sha256 = new SHA256Digest();
 		sha256.update(new byte[] { (byte) 170, (byte) 191, (byte) 203, (byte) 188, (byte) 47, (byte) 37, (byte) 17,
@@ -147,7 +148,7 @@ public class UpdateCertificate {
 			throw new CertificateInvalidException("SHA256 checksum of signature payload is invalid!");
 		}
 		
-		return new UpdateCertificate(certData, EaglerZLIB.newGZIPInputStream(new ByteArrayInputStream(signaturePayload)), vers);
+		return new UpdateCertificate(certData, EaglerZLIB.newGZIPInputStream(new EaglerInputStream(signaturePayload)), vers);
 	}
 
 	private UpdateCertificate(byte[] certData, InputStream is, int sigVers) throws IOException {
@@ -157,18 +158,18 @@ public class UpdateCertificate {
 		this.sigTimestamp = dis.readLong();
 		this.bundleDataLength = dis.readInt();
 		this.bundleDataHash = new byte[32];
-		dis.read(bundleDataHash);
+		IOUtils.readFully(dis, bundleDataHash);
 		this.bundlePackageName = dis.readUTF();
 		this.bundleDisplayName = dis.readUTF();
 		this.bundleAuthorName = dis.readUTF();
 		this.bundleVersionInteger = dis.readInt();
 		this.bundleDisplayVersion = dis.readUTF();
 		this.bundleVersionComment = dis.readUTF();
-		dis.skip(dis.read());
+		IOUtils.skipFully(dis, dis.read());
 		int sourceCount = dis.readInt();
 		this.bundleDataSources = new DLSource[sourceCount];
 		for(int i = 0; i < sourceCount; ++i) {
-			dis.skip(4);
+			IOUtils.skipFully(dis, 4);
 			bundleDataSources[i] = new DLSource(dis.readUTF(), dis.readUTF());
 		}
 	}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/vfs/FolderResourcePack.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/vfs/FolderResourcePack.java
deleted file mode 100755
index 2bb2ecd..0000000
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/vfs/FolderResourcePack.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package net.lax1dude.eaglercraft.v1_8.vfs;
-
-/**
- * Copyright (c) 2022-2023 lax1dude, ayunami2000. All Rights Reserved.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- */
-public class FolderResourcePack extends net.lax1dude.eaglercraft.v1_8.internal.vfs.FolderResourcePack {
-	public FolderResourcePack(String resourcePackFileIn, String prefix) {
-		super(resourcePackFileIn, prefix);
-	}
-}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/vfs/SYS.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/vfs/SYS.java
deleted file mode 100755
index cc56cea..0000000
--- a/src/main/java/net/lax1dude/eaglercraft/v1_8/vfs/SYS.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package net.lax1dude.eaglercraft.v1_8.vfs;
-
-/**
- * Copyright (c) 2022-2023 lax1dude, ayunami2000. All Rights Reserved.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- */
-public class SYS extends net.lax1dude.eaglercraft.v1_8.internal.vfs.SYS {
-}
diff --git a/src/main/java/net/minecraft/block/BlockBed.java b/src/main/java/net/minecraft/block/BlockBed.java
index 1e54be7..5288528 100755
--- a/src/main/java/net/minecraft/block/BlockBed.java
+++ b/src/main/java/net/minecraft/block/BlockBed.java
@@ -1,5 +1,7 @@
 package net.minecraft.block;
 
+import java.util.List;
+
 import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 
 import net.minecraft.block.material.Material;
@@ -129,7 +131,9 @@ public class BlockBed extends BlockDirectional {
 	}
 
 	private EntityPlayer getPlayerInBed(World worldIn, BlockPos pos) {
-		for (EntityPlayer entityplayer : worldIn.playerEntities) {
+		List<EntityPlayer> playerEntities = worldIn.playerEntities;
+		for (int i = 0, l = playerEntities.size(); i < l; ++i) {
+			EntityPlayer entityplayer = playerEntities.get(i);
 			if (entityplayer.isPlayerSleeping() && entityplayer.playerLocation.equals(pos)) {
 				return entityplayer;
 			}
diff --git a/src/main/java/net/minecraft/block/BlockButton.java b/src/main/java/net/minecraft/block/BlockButton.java
index a5cd1db..c9776ac 100755
--- a/src/main/java/net/minecraft/block/BlockButton.java
+++ b/src/main/java/net/minecraft/block/BlockButton.java
@@ -84,7 +84,9 @@ public abstract class BlockButton extends Block {
 	}
 
 	public boolean canPlaceBlockAt(World world, BlockPos blockpos) {
-		for (EnumFacing enumfacing : EnumFacing.values()) {
+		EnumFacing[] facings = EnumFacing._VALUES;
+		for (int i = 0; i < facings.length; ++i) {
+			EnumFacing enumfacing = facings[i];
 			if (func_181088_a(world, blockpos, enumfacing)) {
 				return true;
 			}
diff --git a/src/main/java/net/minecraft/block/BlockCactus.java b/src/main/java/net/minecraft/block/BlockCactus.java
index c36281b..04681b1 100755
--- a/src/main/java/net/minecraft/block/BlockCactus.java
+++ b/src/main/java/net/minecraft/block/BlockCactus.java
@@ -111,7 +111,9 @@ public class BlockCactus extends Block {
 	}
 
 	public boolean canBlockStay(World worldIn, BlockPos pos) {
-		for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) {
+		EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+		for (int i = 0; i < facings.length; ++i) {
+			EnumFacing enumfacing = facings[i];
 			if (worldIn.getBlockState(pos.offset(enumfacing)).getBlock().getMaterial().isSolid()) {
 				return false;
 			}
diff --git a/src/main/java/net/minecraft/block/BlockChest.java b/src/main/java/net/minecraft/block/BlockChest.java
index feeec8f..f5e8fda 100755
--- a/src/main/java/net/minecraft/block/BlockChest.java
+++ b/src/main/java/net/minecraft/block/BlockChest.java
@@ -1,5 +1,7 @@
 package net.minecraft.block;
 
+import java.util.List;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyDirection;
@@ -96,7 +98,9 @@ public class BlockChest extends BlockContainer {
 	public void onBlockAdded(World world, BlockPos blockpos, IBlockState iblockstate) {
 		this.checkForSurroundingChests(world, blockpos, iblockstate);
 
-		for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) {
+		EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facings();
+		for (int i = 0; i < facings.length; ++i) {
+			EnumFacing enumfacing = facings[i];
 			BlockPos blockpos1 = blockpos.offset(enumfacing);
 			IBlockState iblockstate1 = world.getBlockState(blockpos1);
 			if (iblockstate1.getBlock() == this) {
@@ -241,7 +245,9 @@ public class BlockChest extends BlockContainer {
 	public IBlockState correctFacing(World worldIn, BlockPos pos, IBlockState state) {
 		EnumFacing enumfacing = null;
 
-		for (EnumFacing enumfacing1 : EnumFacing.Plane.HORIZONTAL) {
+		EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+		for (int i = 0; i < facings.length; ++i) {
+			EnumFacing enumfacing1 = facings[i];
 			IBlockState iblockstate = worldIn.getBlockState(pos.offset(enumfacing1));
 			if (iblockstate.getBlock() == this) {
 				return state;
@@ -322,7 +328,9 @@ public class BlockChest extends BlockContainer {
 		if (worldIn.getBlockState(pos).getBlock() != this) {
 			return false;
 		} else {
-			for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) {
+			EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+			for (int i = 0; i < facings.length; ++i) {
+				EnumFacing enumfacing = facings[i];
 				if (worldIn.getBlockState(pos.offset(enumfacing)).getBlock() == this) {
 					return true;
 				}
@@ -380,7 +388,9 @@ public class BlockChest extends BlockContainer {
 			if (this.isBlocked(worldIn, pos)) {
 				return null;
 			} else {
-				for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) {
+				EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+				for (int i = 0; i < facings.length; ++i) {
+					EnumFacing enumfacing = facings[i];
 					BlockPos blockpos = pos.offset(enumfacing);
 					Block block = worldIn.getBlockState(blockpos).getBlock();
 					if (block == this) {
@@ -450,9 +460,11 @@ public class BlockChest extends BlockContainer {
 	}
 
 	private boolean isOcelotSittingOnChest(World worldIn, BlockPos pos) {
-		for (Entity entity : worldIn.getEntitiesWithinAABB(EntityOcelot.class,
+		List<Entity> entityList = worldIn.getEntitiesWithinAABB(EntityOcelot.class,
 				new AxisAlignedBB((double) pos.getX(), (double) (pos.getY() + 1), (double) pos.getZ(),
-						(double) (pos.getX() + 1), (double) (pos.getY() + 2), (double) (pos.getZ() + 1)))) {
+						(double) (pos.getX() + 1), (double) (pos.getY() + 2), (double) (pos.getZ() + 1)));
+		for (int i = 0, l = entityList.size(); i < l; ++i) {
+			Entity entity = entityList.get(i);
 			EntityOcelot entityocelot = (EntityOcelot) entity;
 			if (entityocelot.isSitting()) {
 				return true;
diff --git a/src/main/java/net/minecraft/block/BlockColored.java b/src/main/java/net/minecraft/block/BlockColored.java
index 79f84ec..3d41490 100755
--- a/src/main/java/net/minecraft/block/BlockColored.java
+++ b/src/main/java/net/minecraft/block/BlockColored.java
@@ -58,7 +58,9 @@ public class BlockColored extends Block {
 	 * (eg: wood returns 4 blocks)
 	 */
 	public void getSubBlocks(Item item, CreativeTabs var2, List<ItemStack> list) {
-		for (EnumDyeColor enumdyecolor : EnumDyeColor.values()) {
+		EnumDyeColor[] colors = EnumDyeColor.META_LOOKUP;
+		for (int i = 0; i < colors.length; ++i) {
+			EnumDyeColor enumdyecolor = colors[i];
 			list.add(new ItemStack(item, 1, enumdyecolor.getMetadata()));
 		}
 
diff --git a/src/main/java/net/minecraft/block/BlockDirt.java b/src/main/java/net/minecraft/block/BlockDirt.java
index 35658b8..f91ae9e 100755
--- a/src/main/java/net/minecraft/block/BlockDirt.java
+++ b/src/main/java/net/minecraft/block/BlockDirt.java
@@ -127,7 +127,7 @@ public class BlockDirt extends Block {
 		DIRT(0, "dirt", "default", MapColor.dirtColor), COARSE_DIRT(1, "coarse_dirt", "coarse", MapColor.dirtColor),
 		PODZOL(2, "podzol", MapColor.obsidianColor);
 
-		private static final BlockDirt.DirtType[] METADATA_LOOKUP = new BlockDirt.DirtType[values().length];
+		private static final BlockDirt.DirtType[] METADATA_LOOKUP = new BlockDirt.DirtType[3];
 		private final int metadata;
 		private final String name;
 		private final String unlocalizedName;
@@ -173,8 +173,9 @@ public class BlockDirt extends Block {
 		}
 
 		static {
-			for (BlockDirt.DirtType blockdirt$dirttype : values()) {
-				METADATA_LOOKUP[blockdirt$dirttype.getMetadata()] = blockdirt$dirttype;
+			BlockDirt.DirtType[] types = values();
+			for (int i = 0; i < types.length; ++i) {
+				METADATA_LOOKUP[types[i].getMetadata()] = types[i];
 			}
 
 		}
diff --git a/src/main/java/net/minecraft/block/BlockDoublePlant.java b/src/main/java/net/minecraft/block/BlockDoublePlant.java
index 3f64527..bce102d 100755
--- a/src/main/java/net/minecraft/block/BlockDoublePlant.java
+++ b/src/main/java/net/minecraft/block/BlockDoublePlant.java
@@ -245,8 +245,9 @@ public class BlockDoublePlant extends BlockBush implements IGrowable {
 	 * (eg: wood returns 4 blocks)
 	 */
 	public void getSubBlocks(Item item, CreativeTabs var2, List<ItemStack> list) {
-		for (BlockDoublePlant.EnumPlantType blockdoubleplant$enumplanttype : BlockDoublePlant.EnumPlantType.values()) {
-			list.add(new ItemStack(item, 1, blockdoubleplant$enumplanttype.getMeta()));
+		BlockDoublePlant.EnumPlantType[] types = BlockDoublePlant.EnumPlantType.META_LOOKUP;
+		for (int i = 0; i < types.length; ++i) {
+			list.add(new ItemStack(item, 1, types[i].getMeta()));
 		}
 
 	}
@@ -334,7 +335,7 @@ public class BlockDoublePlant extends BlockBush implements IGrowable {
 		SUNFLOWER(0, "sunflower"), SYRINGA(1, "syringa"), GRASS(2, "double_grass", "grass"),
 		FERN(3, "double_fern", "fern"), ROSE(4, "double_rose", "rose"), PAEONIA(5, "paeonia");
 
-		private static final BlockDoublePlant.EnumPlantType[] META_LOOKUP = new BlockDoublePlant.EnumPlantType[values().length];
+		private static final BlockDoublePlant.EnumPlantType[] META_LOOKUP = new BlockDoublePlant.EnumPlantType[6];
 		private final int meta;
 		private final String name;
 		private final String unlocalizedName;
@@ -374,8 +375,9 @@ public class BlockDoublePlant extends BlockBush implements IGrowable {
 		}
 
 		static {
-			for (BlockDoublePlant.EnumPlantType blockdoubleplant$enumplanttype : values()) {
-				META_LOOKUP[blockdoubleplant$enumplanttype.getMeta()] = blockdoubleplant$enumplanttype;
+			BlockDoublePlant.EnumPlantType[] types = BlockDoublePlant.EnumPlantType.values();
+			for (int i = 0; i < types.length; ++i) {
+				META_LOOKUP[types[i].getMeta()] = types[i];
 			}
 
 		}
diff --git a/src/main/java/net/minecraft/block/BlockDynamicLiquid.java b/src/main/java/net/minecraft/block/BlockDynamicLiquid.java
index 4da832c..c35e2ce 100755
--- a/src/main/java/net/minecraft/block/BlockDynamicLiquid.java
+++ b/src/main/java/net/minecraft/block/BlockDynamicLiquid.java
@@ -56,7 +56,9 @@ public class BlockDynamicLiquid extends BlockLiquid {
 			int k = -100;
 			this.adjacentSourceBlocks = 0;
 
-			for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) {
+			EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+			for (int m = 0; m < facings.length; ++m) {
+				EnumFacing enumfacing = facings[m];
 				k = this.checkAdjacentBlock(world, blockpos.offset(enumfacing), k);
 			}
 
@@ -156,7 +158,9 @@ public class BlockDynamicLiquid extends BlockLiquid {
 	private int func_176374_a(World worldIn, BlockPos pos, int distance, EnumFacing calculateFlowCost) {
 		int i = 1000;
 
-		for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) {
+		EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+		for (int l = 0; l < facings.length; ++l) {
+			EnumFacing enumfacing = facings[l];
 			if (enumfacing != calculateFlowCost) {
 				BlockPos blockpos = pos.offset(enumfacing);
 				IBlockState iblockstate = worldIn.getBlockState(blockpos);
@@ -187,7 +191,9 @@ public class BlockDynamicLiquid extends BlockLiquid {
 		int i = 1000;
 		EnumSet enumset = EnumSet.noneOf(EnumFacing.class);
 
-		for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) {
+		EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+		for (int k = 0; k < facings.length; ++k) {
+			EnumFacing enumfacing = facings[k];
 			BlockPos blockpos = pos.offset(enumfacing);
 			IBlockState iblockstate = worldIn.getBlockState(blockpos);
 			if (!this.isBlocked(worldIn, blockpos, iblockstate)
diff --git a/src/main/java/net/minecraft/block/BlockFire.java b/src/main/java/net/minecraft/block/BlockFire.java
index 19af4c2..3368218 100755
--- a/src/main/java/net/minecraft/block/BlockFire.java
+++ b/src/main/java/net/minecraft/block/BlockFire.java
@@ -297,7 +297,9 @@ public class BlockFire extends Block {
 	}
 
 	private boolean canNeighborCatchFire(World worldIn, BlockPos pos) {
-		for (EnumFacing enumfacing : EnumFacing.values()) {
+		EnumFacing[] facings = EnumFacing._VALUES;
+		for (int i = 0; i < facings.length; ++i) {
+			EnumFacing enumfacing = facings[i];
 			if (this.canCatchFire(worldIn, pos.offset(enumfacing))) {
 				return true;
 			}
@@ -312,8 +314,9 @@ public class BlockFire extends Block {
 		} else {
 			int i = 0;
 
-			for (EnumFacing enumfacing : EnumFacing.values()) {
-				i = Math.max(this.getEncouragement(worldIn.getBlockState(pos.offset(enumfacing)).getBlock()), i);
+			EnumFacing[] facings = EnumFacing._VALUES;
+			for (int j = 0; j < facings.length; ++j) {
+				i = Math.max(this.getEncouragement(worldIn.getBlockState(pos.offset(facings[j])).getBlock()), i);
 			}
 
 			return i;
diff --git a/src/main/java/net/minecraft/block/BlockFlower.java b/src/main/java/net/minecraft/block/BlockFlower.java
index 731cb56..d73ba6e 100755
--- a/src/main/java/net/minecraft/block/BlockFlower.java
+++ b/src/main/java/net/minecraft/block/BlockFlower.java
@@ -61,9 +61,9 @@ public abstract class BlockFlower extends BlockBush {
 	 * (eg: wood returns 4 blocks)
 	 */
 	public void getSubBlocks(Item item, CreativeTabs var2, List<ItemStack> list) {
-		for (BlockFlower.EnumFlowerType blockflower$enumflowertype : BlockFlower.EnumFlowerType
-				.getTypes(this.getBlockType())) {
-			list.add(new ItemStack(item, 1, blockflower$enumflowertype.getMeta()));
+		BlockFlower.EnumFlowerType[] flowerTypes = BlockFlower.EnumFlowerType.getTypes(this.getBlockType());
+		for (int i = 0; i < flowerTypes.length; ++i) {
+			list.add(new ItemStack(item, 1, flowerTypes[i].getMeta()));
 		}
 
 	}
@@ -130,8 +130,9 @@ public abstract class BlockFlower extends BlockBush {
 		PINK_TULIP(BlockFlower.EnumFlowerColor.RED, 7, "pink_tulip", "tulipPink"),
 		OXEYE_DAISY(BlockFlower.EnumFlowerColor.RED, 8, "oxeye_daisy", "oxeyeDaisy");
 
-		private static final BlockFlower.EnumFlowerType[][] TYPES_FOR_BLOCK = new BlockFlower.EnumFlowerType[BlockFlower.EnumFlowerColor
-				.values().length][];
+		public static final BlockFlower.EnumFlowerType[] _VALUES = EnumFlowerType.values();
+
+		private static final BlockFlower.EnumFlowerType[][] TYPES_FOR_BLOCK = new BlockFlower.EnumFlowerType[_VALUES.length][];
 		private final BlockFlower.EnumFlowerColor blockType;
 		private final int meta;
 		private final String name;
@@ -185,7 +186,9 @@ public abstract class BlockFlower extends BlockBush {
 		}
 
 		static {
-			for (final BlockFlower.EnumFlowerColor blockflower$enumflowercolor : BlockFlower.EnumFlowerColor.values()) {
+			BlockFlower.EnumFlowerColor[] colors = BlockFlower.EnumFlowerColor.values();
+			for (int i = 0; i < colors.length; ++i) {
+				final BlockFlower.EnumFlowerColor blockflower$enumflowercolor = colors[i];
 				Collection collection = Collections2.filter(Lists.newArrayList(values()),
 						new Predicate<BlockFlower.EnumFlowerType>() {
 							public boolean apply(BlockFlower.EnumFlowerType blockflower$enumflowertype) {
diff --git a/src/main/java/net/minecraft/block/BlockHugeMushroom.java b/src/main/java/net/minecraft/block/BlockHugeMushroom.java
index 76e9dd2..6ba543e 100755
--- a/src/main/java/net/minecraft/block/BlockHugeMushroom.java
+++ b/src/main/java/net/minecraft/block/BlockHugeMushroom.java
@@ -148,8 +148,9 @@ public class BlockHugeMushroom extends Block {
 		}
 
 		static {
-			for (BlockHugeMushroom.EnumType blockhugemushroom$enumtype : values()) {
-				META_LOOKUP[blockhugemushroom$enumtype.getMetadata()] = blockhugemushroom$enumtype;
+			BlockHugeMushroom.EnumType[] types = values();
+			for (int i = 0; i < types.length; ++i) {
+				META_LOOKUP[types[i].getMetadata()] = types[i];
 			}
 
 		}
diff --git a/src/main/java/net/minecraft/block/BlockLadder.java b/src/main/java/net/minecraft/block/BlockLadder.java
index 6cdc8bd..3a56997 100755
--- a/src/main/java/net/minecraft/block/BlockLadder.java
+++ b/src/main/java/net/minecraft/block/BlockLadder.java
@@ -103,7 +103,9 @@ public class BlockLadder extends Block {
 		if (enumfacing.getAxis().isHorizontal() && this.canBlockStay(world, blockpos, enumfacing)) {
 			return this.getDefaultState().withProperty(FACING, enumfacing);
 		} else {
-			for (EnumFacing enumfacing1 : EnumFacing.Plane.HORIZONTAL) {
+			EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+			for (int i = 0; i < facings.length; ++i) {
+				EnumFacing enumfacing1 = facings[i];
 				if (this.canBlockStay(world, blockpos, enumfacing1)) {
 					return this.getDefaultState().withProperty(FACING, enumfacing1);
 				}
diff --git a/src/main/java/net/minecraft/block/BlockLever.java b/src/main/java/net/minecraft/block/BlockLever.java
index 777cfbd..4948a66 100755
--- a/src/main/java/net/minecraft/block/BlockLever.java
+++ b/src/main/java/net/minecraft/block/BlockLever.java
@@ -75,7 +75,9 @@ public class BlockLever extends Block {
 	}
 
 	public boolean canPlaceBlockAt(World world, BlockPos blockpos) {
-		for (EnumFacing enumfacing : EnumFacing.values()) {
+		EnumFacing[] facings = EnumFacing._VALUES;
+		for (int i = 0; i < facings.length; ++i) {
+			EnumFacing enumfacing = facings[i];
 			if (func_181090_a(world, blockpos, enumfacing)) {
 				return true;
 			}
@@ -99,7 +101,9 @@ public class BlockLever extends Block {
 			return iblockstate.withProperty(FACING,
 					BlockLever.EnumOrientation.forFacings(enumfacing, entitylivingbase.getHorizontalFacing()));
 		} else {
-			for (EnumFacing enumfacing1 : EnumFacing.Plane.HORIZONTAL) {
+			EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+			for (int i = 0; i < facings.length; ++i) {
+				EnumFacing enumfacing1 = facings[i];
 				if (enumfacing1 != enumfacing && func_181090_a(world, blockpos, enumfacing1.getOpposite())) {
 					return iblockstate.withProperty(FACING,
 							BlockLever.EnumOrientation.forFacings(enumfacing1, entitylivingbase.getHorizontalFacing()));
@@ -258,7 +262,7 @@ public class BlockLever extends Block {
 		SOUTH(3, "south", EnumFacing.SOUTH), NORTH(4, "north", EnumFacing.NORTH), UP_Z(5, "up_z", EnumFacing.UP),
 		UP_X(6, "up_x", EnumFacing.UP), DOWN_Z(7, "down_z", EnumFacing.DOWN);
 
-		private static final BlockLever.EnumOrientation[] META_LOOKUP = new BlockLever.EnumOrientation[values().length];
+		private static final BlockLever.EnumOrientation[] META_LOOKUP = new BlockLever.EnumOrientation[8];
 		private final int meta;
 		private final String name;
 		private final EnumFacing facing;
@@ -329,8 +333,9 @@ public class BlockLever extends Block {
 		}
 
 		static {
-			for (BlockLever.EnumOrientation blocklever$enumorientation : values()) {
-				META_LOOKUP[blocklever$enumorientation.getMetadata()] = blocklever$enumorientation;
+			BlockLever.EnumOrientation[] orientations = values();
+			for (int i = 0; i < orientations.length; ++i) {
+				META_LOOKUP[orientations[i].getMetadata()] = orientations[i];
 			}
 
 		}
diff --git a/src/main/java/net/minecraft/block/BlockLiquid.java b/src/main/java/net/minecraft/block/BlockLiquid.java
index cba391a..bc0d1b9 100755
--- a/src/main/java/net/minecraft/block/BlockLiquid.java
+++ b/src/main/java/net/minecraft/block/BlockLiquid.java
@@ -159,7 +159,9 @@ public abstract class BlockLiquid extends Block {
 		Vec3 vec3 = new Vec3(0.0D, 0.0D, 0.0D);
 		int i = this.getEffectiveFlowDecay(worldIn, pos);
 
-		for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) {
+		EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+		for (int m = 0; m < facings.length; ++m) {
+			EnumFacing enumfacing = facings[m];
 			BlockPos blockpos = pos.offset(enumfacing);
 			int j = this.getEffectiveFlowDecay(worldIn, blockpos);
 			if (j < 0) {
@@ -180,7 +182,8 @@ public abstract class BlockLiquid extends Block {
 		}
 
 		if (((Integer) worldIn.getBlockState(pos).getValue(LEVEL)).intValue() >= 8) {
-			for (EnumFacing enumfacing1 : EnumFacing.Plane.HORIZONTAL) {
+			for (int j = 0; j < facings.length; ++j) {
+				EnumFacing enumfacing1 = facings[j];
 				BlockPos blockpos1 = pos.offset(enumfacing1);
 				if (this.isBlockSolid(worldIn, blockpos1, enumfacing1)
 						|| this.isBlockSolid(worldIn, blockpos1.up(), enumfacing1)) {
@@ -295,7 +298,9 @@ public abstract class BlockLiquid extends Block {
 		if (this.blockMaterial == Material.lava) {
 			boolean flag = false;
 
-			for (EnumFacing enumfacing : EnumFacing.values()) {
+			EnumFacing[] facings = EnumFacing._VALUES;
+			for (int j = 0; j < facings.length; ++j) {
+				EnumFacing enumfacing = facings[j];
 				if (enumfacing != EnumFacing.DOWN
 						&& worldIn.getBlockState(pos.offset(enumfacing)).getBlock().getMaterial() == Material.water) {
 					flag = true;
diff --git a/src/main/java/net/minecraft/block/BlockPistonBase.java b/src/main/java/net/minecraft/block/BlockPistonBase.java
index 4737d23..1703ebe 100755
--- a/src/main/java/net/minecraft/block/BlockPistonBase.java
+++ b/src/main/java/net/minecraft/block/BlockPistonBase.java
@@ -122,7 +122,9 @@ public class BlockPistonBase extends Block {
 	}
 
 	private boolean shouldBeExtended(World worldIn, BlockPos pos, EnumFacing facing) {
-		for (EnumFacing enumfacing : EnumFacing.values()) {
+		EnumFacing[] facings = EnumFacing._VALUES;
+		for (int i = 0; i < facings.length; ++i) {
+			EnumFacing enumfacing = facings[i];
 			if (enumfacing != facing && worldIn.isSidePowered(pos.offset(enumfacing), enumfacing)) {
 				return true;
 			}
@@ -133,7 +135,8 @@ public class BlockPistonBase extends Block {
 		} else {
 			BlockPos blockpos = pos.up();
 
-			for (EnumFacing enumfacing1 : EnumFacing.values()) {
+			for (int i = 0; i < facings.length; ++i) {
+				EnumFacing enumfacing1 = facings[i];
 				if (enumfacing1 != EnumFacing.DOWN
 						&& worldIn.isSidePowered(blockpos.offset(enumfacing1), enumfacing1)) {
 					return true;
diff --git a/src/main/java/net/minecraft/block/BlockPlanks.java b/src/main/java/net/minecraft/block/BlockPlanks.java
index 91c378d..ba0109d 100755
--- a/src/main/java/net/minecraft/block/BlockPlanks.java
+++ b/src/main/java/net/minecraft/block/BlockPlanks.java
@@ -61,8 +61,9 @@ public class BlockPlanks extends Block {
 	 * (eg: wood returns 4 blocks)
 	 */
 	public void getSubBlocks(Item item, CreativeTabs var2, List<ItemStack> list) {
-		for (BlockPlanks.EnumType blockplanks$enumtype : BlockPlanks.EnumType.values()) {
-			list.add(new ItemStack(item, 1, blockplanks$enumtype.getMetadata()));
+		BlockPlanks.EnumType[] types = BlockPlanks.EnumType.META_LOOKUP;
+		for (int i = 0; i < types.length; ++i) {
+			list.add(new ItemStack(item, 1, types[i].getMetadata()));
 		}
 
 	}
@@ -97,7 +98,7 @@ public class BlockPlanks extends Block {
 		BIRCH(2, "birch", MapColor.sandColor), JUNGLE(3, "jungle", MapColor.dirtColor),
 		ACACIA(4, "acacia", MapColor.adobeColor), DARK_OAK(5, "dark_oak", "big_oak", MapColor.brownColor);
 
-		private static final BlockPlanks.EnumType[] META_LOOKUP = new BlockPlanks.EnumType[values().length];
+		public static final BlockPlanks.EnumType[] META_LOOKUP = new BlockPlanks.EnumType[6];
 		private final int meta;
 		private final String name;
 		private final String unlocalizedName;
@@ -143,8 +144,9 @@ public class BlockPlanks extends Block {
 		}
 
 		static {
-			for (BlockPlanks.EnumType blockplanks$enumtype : values()) {
-				META_LOOKUP[blockplanks$enumtype.getMetadata()] = blockplanks$enumtype;
+			BlockPlanks.EnumType[] types = values();
+			for (int i = 0; i < types.length; ++i) {
+				META_LOOKUP[types[i].getMetadata()] = types[i];
 			}
 
 		}
diff --git a/src/main/java/net/minecraft/block/BlockPortal.java b/src/main/java/net/minecraft/block/BlockPortal.java
index ef81a83..e2e499a 100755
--- a/src/main/java/net/minecraft/block/BlockPortal.java
+++ b/src/main/java/net/minecraft/block/BlockPortal.java
@@ -258,11 +258,13 @@ public class BlockPortal extends BlockBreakable {
 		if (!blockportal$size.func_150860_b()) {
 			return new BlockPattern.PatternHelper(parBlockPos, EnumFacing.NORTH, EnumFacing.UP, loadingcache, 1, 1, 1);
 		} else {
-			int[] aint = new int[EnumFacing.AxisDirection.values().length];
+			EnumFacing.AxisDirection[] axis = EnumFacing.AxisDirection._VALUES;
+			int[] aint = new int[axis.length];
 			EnumFacing enumfacing = blockportal$size.field_150866_c.rotateYCCW();
 			BlockPos blockpos = blockportal$size.field_150861_f.up(blockportal$size.func_181100_a() - 1);
 
-			for (EnumFacing.AxisDirection enumfacing$axisdirection : EnumFacing.AxisDirection.values()) {
+			for (int k = 0; k < axis.length; ++k) {
+				EnumFacing.AxisDirection enumfacing$axisdirection = axis[k];
 				BlockPattern.PatternHelper blockpattern$patternhelper = new BlockPattern.PatternHelper(
 						enumfacing.getAxisDirection() == enumfacing$axisdirection ? blockpos
 								: blockpos.offset(blockportal$size.field_150866_c,
@@ -283,7 +285,8 @@ public class BlockPortal extends BlockBreakable {
 
 			EnumFacing.AxisDirection enumfacing$axisdirection1 = EnumFacing.AxisDirection.POSITIVE;
 
-			for (EnumFacing.AxisDirection enumfacing$axisdirection2 : EnumFacing.AxisDirection.values()) {
+			for (int k = 0; k < axis.length; ++k) {
+				EnumFacing.AxisDirection enumfacing$axisdirection2 = axis[k];
 				if (aint[enumfacing$axisdirection2.ordinal()] < aint[enumfacing$axisdirection1.ordinal()]) {
 					enumfacing$axisdirection1 = enumfacing$axisdirection2;
 				}
diff --git a/src/main/java/net/minecraft/block/BlockPressurePlate.java b/src/main/java/net/minecraft/block/BlockPressurePlate.java
index 516ebd7..0e7f768 100755
--- a/src/main/java/net/minecraft/block/BlockPressurePlate.java
+++ b/src/main/java/net/minecraft/block/BlockPressurePlate.java
@@ -66,7 +66,8 @@ public class BlockPressurePlate extends BlockBasePressurePlate {
 		}
 
 		if (!list.isEmpty()) {
-			for (Entity entity : list) {
+			for (int i = 0, l = list.size(); i < l; ++i) {
+				Entity entity = list.get(i);
 				if (!entity.doesEntityNotTriggerPressurePlate()) {
 					return 15;
 				}
diff --git a/src/main/java/net/minecraft/block/BlockPrismarine.java b/src/main/java/net/minecraft/block/BlockPrismarine.java
index 9082082..9addcbe 100755
--- a/src/main/java/net/minecraft/block/BlockPrismarine.java
+++ b/src/main/java/net/minecraft/block/BlockPrismarine.java
@@ -108,7 +108,7 @@ public class BlockPrismarine extends Block {
 	public static enum EnumType implements IStringSerializable {
 		ROUGH(0, "prismarine", "rough"), BRICKS(1, "prismarine_bricks", "bricks"), DARK(2, "dark_prismarine", "dark");
 
-		private static final BlockPrismarine.EnumType[] META_LOOKUP = new BlockPrismarine.EnumType[values().length];
+		private static final BlockPrismarine.EnumType[] META_LOOKUP = new BlockPrismarine.EnumType[3];
 		private final int meta;
 		private final String name;
 		private final String unlocalizedName;
@@ -144,8 +144,9 @@ public class BlockPrismarine extends Block {
 		}
 
 		static {
-			for (BlockPrismarine.EnumType blockprismarine$enumtype : values()) {
-				META_LOOKUP[blockprismarine$enumtype.getMetadata()] = blockprismarine$enumtype;
+			BlockPrismarine.EnumType[] types = values();
+			for (int i = 0; i < types.length; ++i) {
+				META_LOOKUP[types[i].getMetadata()] = types[i];
 			}
 
 		}
diff --git a/src/main/java/net/minecraft/block/BlockQuartz.java b/src/main/java/net/minecraft/block/BlockQuartz.java
index 6f972f7..1685a63 100755
--- a/src/main/java/net/minecraft/block/BlockQuartz.java
+++ b/src/main/java/net/minecraft/block/BlockQuartz.java
@@ -132,7 +132,7 @@ public class BlockQuartz extends Block {
 		DEFAULT(0, "default", "default"), CHISELED(1, "chiseled", "chiseled"), LINES_Y(2, "lines_y", "lines"),
 		LINES_X(3, "lines_x", "lines"), LINES_Z(4, "lines_z", "lines");
 
-		private static final BlockQuartz.EnumType[] META_LOOKUP = new BlockQuartz.EnumType[values().length];
+		private static final BlockQuartz.EnumType[] META_LOOKUP = new BlockQuartz.EnumType[5];
 		private final int meta;
 		private final String field_176805_h;
 		private final String unlocalizedName;
@@ -164,8 +164,9 @@ public class BlockQuartz extends Block {
 		}
 
 		static {
-			for (BlockQuartz.EnumType blockquartz$enumtype : values()) {
-				META_LOOKUP[blockquartz$enumtype.getMetadata()] = blockquartz$enumtype;
+			BlockQuartz.EnumType[] types = values();
+			for (int i = 0; i < types.length; ++i) {
+				META_LOOKUP[types[i].getMetadata()] = types[i];
 			}
 
 		}
diff --git a/src/main/java/net/minecraft/block/BlockRailBase.java b/src/main/java/net/minecraft/block/BlockRailBase.java
index 332a836..8f0884a 100755
--- a/src/main/java/net/minecraft/block/BlockRailBase.java
+++ b/src/main/java/net/minecraft/block/BlockRailBase.java
@@ -184,7 +184,7 @@ public abstract class BlockRailBase extends Block {
 		ASCENDING_SOUTH(5, "ascending_south"), SOUTH_EAST(6, "south_east"), SOUTH_WEST(7, "south_west"),
 		NORTH_WEST(8, "north_west"), NORTH_EAST(9, "north_east");
 
-		private static final BlockRailBase.EnumRailDirection[] META_LOOKUP = new BlockRailBase.EnumRailDirection[values().length];
+		private static final BlockRailBase.EnumRailDirection[] META_LOOKUP = new BlockRailBase.EnumRailDirection[10];
 		private final int meta;
 		private final String name;
 
@@ -219,8 +219,9 @@ public abstract class BlockRailBase extends Block {
 		}
 
 		static {
-			for (BlockRailBase.EnumRailDirection blockrailbase$enumraildirection : values()) {
-				META_LOOKUP[blockrailbase$enumraildirection.getMetadata()] = blockrailbase$enumraildirection;
+			BlockRailBase.EnumRailDirection[] directions = values();
+			for (int i = 0; i < directions.length; ++i) {
+				META_LOOKUP[directions[i].getMetadata()] = directions[i];
 			}
 
 		}
@@ -345,8 +346,10 @@ public abstract class BlockRailBase extends Block {
 		protected int countAdjacentRails() {
 			int i = 0;
 
-			for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) {
-				if (this.hasRailAt(this.pos.offset(enumfacing))) {
+			EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+			BlockPos tmp = new BlockPos(0, 0, 0);
+			for (int j = 0; j < facings.length; ++j) {
+				if (this.hasRailAt(this.pos.offsetEvenFaster(facings[j], tmp))) {
 					++i;
 				}
 			}
diff --git a/src/main/java/net/minecraft/block/BlockRailDetector.java b/src/main/java/net/minecraft/block/BlockRailDetector.java
index 431af12..61299c9 100755
--- a/src/main/java/net/minecraft/block/BlockRailDetector.java
+++ b/src/main/java/net/minecraft/block/BlockRailDetector.java
@@ -43,7 +43,6 @@ import net.minecraft.world.World;
  * 
  */
 public class BlockRailDetector extends BlockRailBase {
-
 	public static PropertyEnum<BlockRailBase.EnumRailDirection> SHAPE;
 	public static final PropertyBool POWERED = PropertyBool.create("powered");
 
diff --git a/src/main/java/net/minecraft/block/BlockRedSandstone.java b/src/main/java/net/minecraft/block/BlockRedSandstone.java
index 21883b9..1d7861a 100755
--- a/src/main/java/net/minecraft/block/BlockRedSandstone.java
+++ b/src/main/java/net/minecraft/block/BlockRedSandstone.java
@@ -60,8 +60,9 @@ public class BlockRedSandstone extends Block {
 	 * (eg: wood returns 4 blocks)
 	 */
 	public void getSubBlocks(Item item, CreativeTabs var2, List<ItemStack> list) {
-		for (BlockRedSandstone.EnumType blockredsandstone$enumtype : BlockRedSandstone.EnumType.values()) {
-			list.add(new ItemStack(item, 1, blockredsandstone$enumtype.getMetadata()));
+		BlockRedSandstone.EnumType[] types = BlockRedSandstone.EnumType.META_LOOKUP;
+		for (int i = 0; i < types.length; ++i) {
+			list.add(new ItemStack(item, 1, types[i].getMetadata()));
 		}
 
 	}
@@ -88,7 +89,7 @@ public class BlockRedSandstone extends Block {
 		DEFAULT(0, "red_sandstone", "default"), CHISELED(1, "chiseled_red_sandstone", "chiseled"),
 		SMOOTH(2, "smooth_red_sandstone", "smooth");
 
-		private static final BlockRedSandstone.EnumType[] META_LOOKUP = new BlockRedSandstone.EnumType[values().length];
+		public static final BlockRedSandstone.EnumType[] META_LOOKUP = new BlockRedSandstone.EnumType[3];
 		private final int meta;
 		private final String name;
 		private final String unlocalizedName;
@@ -124,8 +125,9 @@ public class BlockRedSandstone extends Block {
 		}
 
 		static {
-			for (BlockRedSandstone.EnumType blockredsandstone$enumtype : values()) {
-				META_LOOKUP[blockredsandstone$enumtype.getMetadata()] = blockredsandstone$enumtype;
+			BlockRedSandstone.EnumType[] types = values();
+			for (int i = 0; i < types.length; ++i) {
+				META_LOOKUP[types[i].getMetadata()] = types[i];
 			}
 
 		}
diff --git a/src/main/java/net/minecraft/block/BlockRedstoneDiode.java b/src/main/java/net/minecraft/block/BlockRedstoneDiode.java
index 65597e8..0087315 100755
--- a/src/main/java/net/minecraft/block/BlockRedstoneDiode.java
+++ b/src/main/java/net/minecraft/block/BlockRedstoneDiode.java
@@ -109,8 +109,10 @@ public abstract class BlockRedstoneDiode extends BlockDirectional {
 			this.dropBlockAsItem(world, blockpos, iblockstate, 0);
 			world.setBlockToAir(blockpos);
 
-			for (EnumFacing enumfacing : EnumFacing.values()) {
-				world.notifyNeighborsOfStateChange(blockpos.offset(enumfacing), this);
+			EnumFacing[] facings = EnumFacing._VALUES;
+			BlockPos tmp = new BlockPos(0, 0, 0);
+			for (int i = 0; i < facings.length; ++i) {
+				world.notifyNeighborsOfStateChange(blockpos.offsetEvenFaster(facings[i], tmp), this);
 			}
 
 		}
@@ -219,8 +221,10 @@ public abstract class BlockRedstoneDiode extends BlockDirectional {
 	 */
 	public void onBlockDestroyedByPlayer(World world, BlockPos blockpos, IBlockState iblockstate) {
 		if (this.isRepeaterPowered) {
-			for (EnumFacing enumfacing : EnumFacing.values()) {
-				world.notifyNeighborsOfStateChange(blockpos.offset(enumfacing), this);
+			EnumFacing[] facings = EnumFacing._VALUES;
+			BlockPos tmp = new BlockPos(0, 0, 0);
+			for (int i = 0; i < facings.length; ++i) {
+				world.notifyNeighborsOfStateChange(blockpos.offsetEvenFaster(facings[i], tmp), this);
 			}
 		}
 
diff --git a/src/main/java/net/minecraft/block/BlockRedstoneTorch.java b/src/main/java/net/minecraft/block/BlockRedstoneTorch.java
index ab26119..06c751c 100755
--- a/src/main/java/net/minecraft/block/BlockRedstoneTorch.java
+++ b/src/main/java/net/minecraft/block/BlockRedstoneTorch.java
@@ -81,8 +81,10 @@ public class BlockRedstoneTorch extends BlockTorch {
 
 	public void onBlockAdded(World world, BlockPos blockpos, IBlockState var3) {
 		if (this.isOn) {
-			for (EnumFacing enumfacing : EnumFacing.values()) {
-				world.notifyNeighborsOfStateChange(blockpos.offset(enumfacing), this);
+			EnumFacing[] facings = EnumFacing._VALUES;
+			BlockPos tmp = new BlockPos(0, 0, 0);
+			for (int i = 0; i < facings.length; ++i) {
+				world.notifyNeighborsOfStateChange(blockpos.offsetEvenFaster(facings[i], tmp), this);
 			}
 		}
 
@@ -90,8 +92,10 @@ public class BlockRedstoneTorch extends BlockTorch {
 
 	public void breakBlock(World world, BlockPos blockpos, IBlockState var3) {
 		if (this.isOn) {
-			for (EnumFacing enumfacing : EnumFacing.values()) {
-				world.notifyNeighborsOfStateChange(blockpos.offset(enumfacing), this);
+			EnumFacing[] facings = EnumFacing._VALUES;
+			BlockPos tmp = new BlockPos(0, 0, 0);
+			for (int i = 0; i < facings.length; ++i) {
+				world.notifyNeighborsOfStateChange(blockpos.offsetEvenFaster(facings[i], tmp), this);
 			}
 		}
 
diff --git a/src/main/java/net/minecraft/block/BlockRedstoneWire.java b/src/main/java/net/minecraft/block/BlockRedstoneWire.java
index 8270571..eea7caf 100755
--- a/src/main/java/net/minecraft/block/BlockRedstoneWire.java
+++ b/src/main/java/net/minecraft/block/BlockRedstoneWire.java
@@ -96,12 +96,13 @@ public class BlockRedstoneWire extends Block {
 	private BlockRedstoneWire.EnumAttachPosition getAttachPosition(IBlockAccess worldIn, BlockPos pos,
 			EnumFacing direction) {
 		BlockPos blockpos = pos.offset(direction);
-		Block block = worldIn.getBlockState(pos.offset(direction)).getBlock();
-		if (!canConnectTo(worldIn.getBlockState(blockpos), direction)
-				&& (block.isBlockNormalCube() || !canConnectUpwardsTo(worldIn.getBlockState(blockpos.down())))) {
+		BlockPos posTmp = new BlockPos(0, 0, 0);
+		Block block = worldIn.getBlockState(blockpos).getBlock();
+		if (!canConnectTo(worldIn.getBlockState(blockpos), direction) && (block.isBlockNormalCube()
+				|| !canConnectUpwardsTo(worldIn.getBlockState(blockpos.offsetEvenFaster(EnumFacing.UP, posTmp))))) {
 			Block block1 = worldIn.getBlockState(pos.up()).getBlock();
 			return !block1.isBlockNormalCube() && block.isBlockNormalCube()
-					&& canConnectUpwardsTo(worldIn.getBlockState(blockpos.up()))
+					&& canConnectUpwardsTo(worldIn.getBlockState(blockpos.offsetEvenFaster(EnumFacing.UP, posTmp)))
 							? BlockRedstoneWire.EnumAttachPosition.UP
 							: BlockRedstoneWire.EnumAttachPosition.NONE;
 		} else {
@@ -132,8 +133,9 @@ public class BlockRedstoneWire extends Block {
 	}
 
 	public boolean canPlaceBlockAt(World world, BlockPos blockpos) {
-		return World.doesBlockHaveSolidTopSurface(world, blockpos.down())
-				|| world.getBlockState(blockpos.down()).getBlock() == Blocks.glowstone;
+		BlockPos fuckOff = blockpos.down();
+		return World.doesBlockHaveSolidTopSurface(world, fuckOff)
+				|| world.getBlockState(fuckOff).getBlock() == Blocks.glowstone;
 	}
 
 	private IBlockState updateSurroundingRedstone(World worldIn, BlockPos pos, IBlockState state) {
@@ -141,8 +143,8 @@ public class BlockRedstoneWire extends Block {
 		ArrayList<BlockPos> arraylist = Lists.newArrayList(this.blocksNeedingUpdate);
 		this.blocksNeedingUpdate.clear();
 
-		for (BlockPos blockpos : arraylist) {
-			worldIn.notifyNeighborsOfStateChange(blockpos, this);
+		for (int i = 0, l = arraylist.size(); i < l; ++i) {
+			worldIn.notifyNeighborsOfStateChange(arraylist.get(i), this);
 		}
 
 		return state;
@@ -162,9 +164,12 @@ public class BlockRedstoneWire extends Block {
 
 		int l = 0;
 
-		for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) {
-			BlockPos blockpos = pos1.offset(enumfacing);
-			boolean flag = blockpos.getX() != pos2.getX() || blockpos.getZ() != pos2.getZ();
+		EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+		BlockPos tmp = new BlockPos(0, 0, 0);
+		for (int m = 0; m < facings.length; ++m) {
+			EnumFacing enumfacing = facings[m];
+			BlockPos blockpos = pos1.offsetEvenFaster(enumfacing, tmp);
+			boolean flag = blockpos.x != pos2.x || blockpos.z != pos2.z;
 			if (flag) {
 				l = this.getMaxCurrentStrength(worldIn, blockpos, l);
 			}
@@ -200,8 +205,8 @@ public class BlockRedstoneWire extends Block {
 
 			this.blocksNeedingUpdate.add(pos1);
 
-			for (EnumFacing enumfacing1 : EnumFacing.values()) {
-				this.blocksNeedingUpdate.add(pos1.offset(enumfacing1));
+			for (int m = 0; m < facings.length; ++m) {
+				this.blocksNeedingUpdate.add(pos1.offset(facings[m]));
 			}
 		}
 
@@ -217,8 +222,10 @@ public class BlockRedstoneWire extends Block {
 		if (worldIn.getBlockState(pos).getBlock() == this) {
 			worldIn.notifyNeighborsOfStateChange(pos, this);
 
-			for (EnumFacing enumfacing : EnumFacing.values()) {
-				worldIn.notifyNeighborsOfStateChange(pos.offset(enumfacing), this);
+			EnumFacing[] facings = EnumFacing._VALUES;
+			BlockPos tmp = new BlockPos(0, 0, 0);
+			for (int i = 0; i < facings.length; ++i) {
+				worldIn.notifyNeighborsOfStateChange(pos.offsetEvenFaster(facings[i], tmp), this);
 			}
 
 		}
@@ -228,20 +235,25 @@ public class BlockRedstoneWire extends Block {
 		if (!world.isRemote) {
 			this.updateSurroundingRedstone(world, blockpos, iblockstate);
 
-			for (EnumFacing enumfacing : EnumFacing.Plane.VERTICAL) {
-				world.notifyNeighborsOfStateChange(blockpos.offset(enumfacing), this);
+			BlockPos tmp = new BlockPos(0, 0, 0);
+			EnumFacing[] facings = EnumFacing.Plane.VERTICAL.facingsArray;
+			for (int i = 0; i < facings.length; ++i) {
+				world.notifyNeighborsOfStateChange(blockpos.offsetEvenFaster(facings[i], tmp), this);
 			}
 
-			for (EnumFacing enumfacing1 : EnumFacing.Plane.HORIZONTAL) {
-				this.notifyWireNeighborsOfStateChange(world, blockpos.offset(enumfacing1));
+			facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+			for (int i = 0; i < facings.length; ++i) {
+				this.notifyWireNeighborsOfStateChange(world, blockpos.offsetEvenFaster(facings[i], tmp));
 			}
 
-			for (EnumFacing enumfacing2 : EnumFacing.Plane.HORIZONTAL) {
-				BlockPos blockpos1 = blockpos.offset(enumfacing2);
+			for (int i = 0; i < facings.length; ++i) {
+				BlockPos blockpos1 = blockpos.offsetEvenFaster(facings[i], tmp);
 				if (world.getBlockState(blockpos1).getBlock().isNormalCube()) {
-					this.notifyWireNeighborsOfStateChange(world, blockpos1.up());
+					++blockpos1.y;
+					this.notifyWireNeighborsOfStateChange(world, blockpos1);
 				} else {
-					this.notifyWireNeighborsOfStateChange(world, blockpos1.down());
+					--blockpos1.y;
+					this.notifyWireNeighborsOfStateChange(world, blockpos1);
 				}
 			}
 		}
@@ -250,22 +262,28 @@ public class BlockRedstoneWire extends Block {
 	public void breakBlock(World world, BlockPos blockpos, IBlockState iblockstate) {
 		super.breakBlock(world, blockpos, iblockstate);
 		if (!world.isRemote) {
-			for (EnumFacing enumfacing : EnumFacing.values()) {
-				world.notifyNeighborsOfStateChange(blockpos.offset(enumfacing), this);
+			BlockPos tmp = new BlockPos(0, 0, 0);
+			EnumFacing[] facings = EnumFacing._VALUES;
+			for (int i = 0; i < facings.length; ++i) {
+				world.notifyNeighborsOfStateChange(blockpos.offsetEvenFaster(facings[i], tmp), this);
 			}
 
 			this.updateSurroundingRedstone(world, blockpos, iblockstate);
 
-			for (EnumFacing enumfacing1 : EnumFacing.Plane.HORIZONTAL) {
-				this.notifyWireNeighborsOfStateChange(world, blockpos.offset(enumfacing1));
+			facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+			for (int i = 0; i < facings.length; ++i) {
+				this.notifyWireNeighborsOfStateChange(world, blockpos.offsetEvenFaster(facings[i], tmp));
 			}
 
-			for (EnumFacing enumfacing2 : EnumFacing.Plane.HORIZONTAL) {
-				BlockPos blockpos1 = blockpos.offset(enumfacing2);
+			facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+			for (int i = 0; i < facings.length; ++i) {
+				BlockPos blockpos1 = blockpos.offsetEvenFaster(facings[i], tmp);
 				if (world.getBlockState(blockpos1).getBlock().isNormalCube()) {
-					this.notifyWireNeighborsOfStateChange(world, blockpos1.up());
+					++blockpos1.y;
+					this.notifyWireNeighborsOfStateChange(world, blockpos1);
 				} else {
-					this.notifyWireNeighborsOfStateChange(world, blockpos1.down());
+					--blockpos1.y;
+					this.notifyWireNeighborsOfStateChange(world, blockpos1);
 				}
 			}
 		}
@@ -319,7 +337,9 @@ public class BlockRedstoneWire extends Block {
 			} else {
 				EnumSet enumset = EnumSet.noneOf(EnumFacing.class);
 
-				for (EnumFacing enumfacing1 : EnumFacing.Plane.HORIZONTAL) {
+				EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+				for (int j = 0; j < facings.length; ++j) {
+					EnumFacing enumfacing1 = facings[j];
 					if (this.func_176339_d(iblockaccess, blockpos, enumfacing1)) {
 						enumset.add(enumfacing1);
 					}
diff --git a/src/main/java/net/minecraft/block/BlockReed.java b/src/main/java/net/minecraft/block/BlockReed.java
index 59320e3..c81df45 100755
--- a/src/main/java/net/minecraft/block/BlockReed.java
+++ b/src/main/java/net/minecraft/block/BlockReed.java
@@ -49,18 +49,20 @@ public class BlockReed extends Block {
 	}
 
 	public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) {
-		if (world.getBlockState(blockpos.down()).getBlock() == Blocks.reeds
+		BlockPos tmp = new BlockPos(0, 0, 0);
+		if (world.getBlockState(blockpos.offsetEvenFaster(EnumFacing.DOWN, tmp)).getBlock() == Blocks.reeds
 				|| this.checkForDrop(world, blockpos, iblockstate)) {
-			if (world.isAirBlock(blockpos.up())) {
+			if (world.isAirBlock(blockpos.offsetEvenFaster(EnumFacing.UP, tmp))) {
 				int i;
-				for (i = 1; world.getBlockState(blockpos.down(i)).getBlock() == this; ++i) {
+				--tmp.y;
+				for (i = 1; world.getBlockState(tmp.offsetEvenFaster(EnumFacing.DOWN, tmp)).getBlock() == this; ++i) {
 					;
 				}
 
 				if (i < 3) {
 					int j = ((Integer) iblockstate.getValue(AGE)).intValue();
 					if (j == 15) {
-						world.setBlockState(blockpos.up(), this.getDefaultState());
+						world.setBlockState(blockpos.offsetEvenFaster(EnumFacing.UP, tmp), this.getDefaultState());
 						world.setBlockState(blockpos, iblockstate.withProperty(AGE, Integer.valueOf(0)), 4);
 					} else {
 						world.setBlockState(blockpos, iblockstate.withProperty(AGE, Integer.valueOf(j + 1)), 4);
@@ -72,15 +74,19 @@ public class BlockReed extends Block {
 	}
 
 	public boolean canPlaceBlockAt(World world, BlockPos blockpos) {
-		Block block = world.getBlockState(blockpos.down()).getBlock();
+		BlockPos down = blockpos.down();
+		Block block = world.getBlockState(down).getBlock();
 		if (block == this) {
 			return true;
 		} else if (block != Blocks.grass && block != Blocks.dirt && block != Blocks.sand) {
 			return false;
 		} else {
-			for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) {
-				if (world.getBlockState(blockpos.offset(enumfacing).down()).getBlock()
-						.getMaterial() == Material.water) {
+			EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+			for (int i = 0; i < facings.length; ++i) {
+				EnumFacing enumfacing = facings[i];
+				down = blockpos.offsetEvenFaster(enumfacing, down);
+				--down.y;
+				if (world.getBlockState(down).getBlock().getMaterial() == Material.water) {
 					return true;
 				}
 			}
diff --git a/src/main/java/net/minecraft/block/BlockSand.java b/src/main/java/net/minecraft/block/BlockSand.java
index 64ff6fb..58e1175 100755
--- a/src/main/java/net/minecraft/block/BlockSand.java
+++ b/src/main/java/net/minecraft/block/BlockSand.java
@@ -58,8 +58,9 @@ public class BlockSand extends BlockFalling {
 	 * (eg: wood returns 4 blocks)
 	 */
 	public void getSubBlocks(Item item, CreativeTabs var2, List<ItemStack> list) {
-		for (BlockSand.EnumType blocksand$enumtype : BlockSand.EnumType.values()) {
-			list.add(new ItemStack(item, 1, blocksand$enumtype.getMetadata()));
+		BlockSand.EnumType[] blocks = BlockSand.EnumType.META_LOOKUP;
+		for (int i = 0; i < blocks.length; ++i) {
+			list.add(new ItemStack(item, 1, blocks[i].getMetadata()));
 		}
 
 	}
@@ -92,7 +93,7 @@ public class BlockSand extends BlockFalling {
 	public static enum EnumType implements IStringSerializable {
 		SAND(0, "sand", "default", MapColor.sandColor), RED_SAND(1, "red_sand", "red", MapColor.adobeColor);
 
-		private static final BlockSand.EnumType[] META_LOOKUP = new BlockSand.EnumType[values().length];
+		public static final BlockSand.EnumType[] META_LOOKUP = new BlockSand.EnumType[2];
 		private final int meta;
 		private final String name;
 		private final MapColor mapColor;
@@ -137,8 +138,9 @@ public class BlockSand extends BlockFalling {
 		}
 
 		static {
-			for (BlockSand.EnumType blocksand$enumtype : values()) {
-				META_LOOKUP[blocksand$enumtype.getMetadata()] = blocksand$enumtype;
+			BlockSand.EnumType[] types = values();
+			for (int i = 0; i < types.length; ++i) {
+				META_LOOKUP[types[i].getMetadata()] = types[i];
 			}
 
 		}
diff --git a/src/main/java/net/minecraft/block/BlockSandStone.java b/src/main/java/net/minecraft/block/BlockSandStone.java
index bc70e24..f5c249f 100755
--- a/src/main/java/net/minecraft/block/BlockSandStone.java
+++ b/src/main/java/net/minecraft/block/BlockSandStone.java
@@ -61,8 +61,9 @@ public class BlockSandStone extends Block {
 	 * (eg: wood returns 4 blocks)
 	 */
 	public void getSubBlocks(Item item, CreativeTabs var2, List<ItemStack> list) {
-		for (BlockSandStone.EnumType blocksandstone$enumtype : BlockSandStone.EnumType.values()) {
-			list.add(new ItemStack(item, 1, blocksandstone$enumtype.getMetadata()));
+		BlockSandStone.EnumType[] types = BlockSandStone.EnumType.META_LOOKUP;
+		for (int i = 0; i < types.length; ++i) {
+			list.add(new ItemStack(item, 1, types[i].getMetadata()));
 		}
 
 	}
@@ -96,7 +97,7 @@ public class BlockSandStone extends Block {
 		DEFAULT(0, "sandstone", "default"), CHISELED(1, "chiseled_sandstone", "chiseled"),
 		SMOOTH(2, "smooth_sandstone", "smooth");
 
-		private static final BlockSandStone.EnumType[] META_LOOKUP = new BlockSandStone.EnumType[values().length];
+		public static final BlockSandStone.EnumType[] META_LOOKUP = new BlockSandStone.EnumType[3];
 		private final int metadata;
 		private final String name;
 		private final String unlocalizedName;
@@ -132,8 +133,9 @@ public class BlockSandStone extends Block {
 		}
 
 		static {
-			for (BlockSandStone.EnumType blocksandstone$enumtype : values()) {
-				META_LOOKUP[blocksandstone$enumtype.getMetadata()] = blocksandstone$enumtype;
+			BlockSandStone.EnumType[] types = values();
+			for (int i = 0; i < types.length; ++i) {
+				META_LOOKUP[types[i].getMetadata()] = types[i];
 			}
 
 		}
diff --git a/src/main/java/net/minecraft/block/BlockSapling.java b/src/main/java/net/minecraft/block/BlockSapling.java
index a8af96c..5d261c8 100755
--- a/src/main/java/net/minecraft/block/BlockSapling.java
+++ b/src/main/java/net/minecraft/block/BlockSapling.java
@@ -212,8 +212,9 @@ public class BlockSapling extends BlockBush implements IGrowable {
 	 * (eg: wood returns 4 blocks)
 	 */
 	public void getSubBlocks(Item item, CreativeTabs var2, List<ItemStack> list) {
-		for (BlockPlanks.EnumType blockplanks$enumtype : BlockPlanks.EnumType.values()) {
-			list.add(new ItemStack(item, 1, blockplanks$enumtype.getMetadata()));
+		BlockPlanks.EnumType[] types = BlockPlanks.EnumType.META_LOOKUP;
+		for (int i = 0; i < types.length; ++i) {
+			list.add(new ItemStack(item, 1, types[i].getMetadata()));
 		}
 
 	}
diff --git a/src/main/java/net/minecraft/block/BlockSilverfish.java b/src/main/java/net/minecraft/block/BlockSilverfish.java
index 0a3f10b..75b234b 100755
--- a/src/main/java/net/minecraft/block/BlockSilverfish.java
+++ b/src/main/java/net/minecraft/block/BlockSilverfish.java
@@ -105,8 +105,9 @@ public class BlockSilverfish extends Block {
 	 * (eg: wood returns 4 blocks)
 	 */
 	public void getSubBlocks(Item item, CreativeTabs var2, List<ItemStack> list) {
-		for (BlockSilverfish.EnumType blocksilverfish$enumtype : BlockSilverfish.EnumType.values()) {
-			list.add(new ItemStack(item, 1, blocksilverfish$enumtype.getMetadata()));
+		BlockSilverfish.EnumType[] types = BlockSilverfish.EnumType.META_LOOKUP;
+		for (int i = 0; i < types.length; ++i) {
+			list.add(new ItemStack(item, 1, types[i].getMetadata()));
 		}
 
 	}
@@ -165,7 +166,7 @@ public class BlockSilverfish extends Block {
 			}
 		};
 
-		private static final BlockSilverfish.EnumType[] META_LOOKUP = new BlockSilverfish.EnumType[values().length];
+		public static final BlockSilverfish.EnumType[] META_LOOKUP = new BlockSilverfish.EnumType[6];
 		private final int meta;
 		private final String name;
 		private final String unlocalizedName;
@@ -207,7 +208,9 @@ public class BlockSilverfish extends Block {
 		public abstract IBlockState getModelBlock();
 
 		public static BlockSilverfish.EnumType forModelBlock(IBlockState model) {
-			for (BlockSilverfish.EnumType blocksilverfish$enumtype : values()) {
+			BlockSilverfish.EnumType[] types = BlockSilverfish.EnumType.META_LOOKUP;
+			for (int i = 0; i < types.length; ++i) {
+				BlockSilverfish.EnumType blocksilverfish$enumtype = types[i];
 				if (model == blocksilverfish$enumtype.getModelBlock()) {
 					return blocksilverfish$enumtype;
 				}
@@ -217,8 +220,9 @@ public class BlockSilverfish extends Block {
 		}
 
 		static {
-			for (BlockSilverfish.EnumType blocksilverfish$enumtype : values()) {
-				META_LOOKUP[blocksilverfish$enumtype.getMetadata()] = blocksilverfish$enumtype;
+			BlockSilverfish.EnumType[] types = BlockSilverfish.EnumType.values();
+			for (int i = 0; i < types.length; ++i) {
+				META_LOOKUP[types[i].getMetadata()] = types[i];
 			}
 
 		}
diff --git a/src/main/java/net/minecraft/block/BlockSkull.java b/src/main/java/net/minecraft/block/BlockSkull.java
index b3ddc9f..a0ff2ea 100755
--- a/src/main/java/net/minecraft/block/BlockSkull.java
+++ b/src/main/java/net/minecraft/block/BlockSkull.java
@@ -2,6 +2,8 @@ package net.minecraft.block;
 
 import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 
+import java.util.List;
+
 import com.google.common.base.Predicate;
 
 import net.minecraft.block.material.Material;
@@ -228,9 +230,10 @@ public class BlockSkull extends BlockContainer {
 						: 90.0F;
 				entitywither.func_82206_m();
 
-				for (EntityPlayer entityplayer : worldIn.getEntitiesWithinAABB(EntityPlayer.class,
-						entitywither.getEntityBoundingBox().expand(50.0D, 50.0D, 50.0D))) {
-					entityplayer.triggerAchievement(AchievementList.spawnWither);
+				List<EntityPlayer> list = worldIn.getEntitiesWithinAABB(EntityPlayer.class,
+						entitywither.getEntityBoundingBox().expand(50.0D, 50.0D, 50.0D));
+				for (int j = 0, l = list.size(); j < l; ++j) {
+					list.get(j).triggerAchievement(AchievementList.spawnWither);
 				}
 
 				worldIn.spawnEntityInWorld(entitywither);
diff --git a/src/main/java/net/minecraft/block/BlockSponge.java b/src/main/java/net/minecraft/block/BlockSponge.java
index a23cd26..cf5efea 100755
--- a/src/main/java/net/minecraft/block/BlockSponge.java
+++ b/src/main/java/net/minecraft/block/BlockSponge.java
@@ -96,13 +96,16 @@ public class BlockSponge extends Block {
 		linkedlist.add(new Tuple(pos, Integer.valueOf(0)));
 		int i = 0;
 
+		BlockPos tmp = new BlockPos(0, 0, 0);
 		while (!linkedlist.isEmpty()) {
 			Tuple tuple = (Tuple) linkedlist.poll();
 			BlockPos blockpos = (BlockPos) tuple.getFirst();
 			int j = ((Integer) tuple.getSecond()).intValue();
 
-			for (EnumFacing enumfacing : EnumFacing.values()) {
-				BlockPos blockpos1 = blockpos.offset(enumfacing);
+			EnumFacing[] facings = EnumFacing._VALUES;
+			for (int k = 0; k < facings.length; ++k) {
+				EnumFacing enumfacing = facings[k];
+				BlockPos blockpos1 = blockpos.offsetEvenFaster(enumfacing, tmp);
 				if (worldIn.getBlockState(blockpos1).getBlock().getMaterial() == Material.water) {
 					worldIn.setBlockState(blockpos1, Blocks.air.getDefaultState(), 2);
 					arraylist.add(blockpos1);
@@ -118,8 +121,8 @@ public class BlockSponge extends Block {
 			}
 		}
 
-		for (BlockPos blockpos2 : arraylist) {
-			worldIn.notifyNeighborsOfStateChange(blockpos2, Blocks.air);
+		for (int j = 0, l = arraylist.size(); j < l; ++j) {
+			worldIn.notifyNeighborsOfStateChange(arraylist.get(j), Blocks.air);
 		}
 
 		return i > 0;
diff --git a/src/main/java/net/minecraft/block/BlockStainedGlass.java b/src/main/java/net/minecraft/block/BlockStainedGlass.java
index c436902..f964f98 100755
--- a/src/main/java/net/minecraft/block/BlockStainedGlass.java
+++ b/src/main/java/net/minecraft/block/BlockStainedGlass.java
@@ -62,8 +62,9 @@ public class BlockStainedGlass extends BlockBreakable {
 	 * (eg: wood returns 4 blocks)
 	 */
 	public void getSubBlocks(Item item, CreativeTabs var2, List<ItemStack> list) {
-		for (EnumDyeColor enumdyecolor : EnumDyeColor.values()) {
-			list.add(new ItemStack(item, 1, enumdyecolor.getMetadata()));
+		EnumDyeColor[] colors = EnumDyeColor.META_LOOKUP;
+		for (int i = 0; i < colors.length; ++i) {
+			list.add(new ItemStack(item, 1, colors[i].getMetadata()));
 		}
 
 	}
diff --git a/src/main/java/net/minecraft/block/BlockStainedGlassPane.java b/src/main/java/net/minecraft/block/BlockStainedGlassPane.java
index 2a2c4f2..e1db700 100755
--- a/src/main/java/net/minecraft/block/BlockStainedGlassPane.java
+++ b/src/main/java/net/minecraft/block/BlockStainedGlassPane.java
@@ -63,7 +63,7 @@ public class BlockStainedGlassPane extends BlockPane {
 	 * (eg: wood returns 4 blocks)
 	 */
 	public void getSubBlocks(Item item, CreativeTabs var2, List<ItemStack> list) {
-		for (int i = 0; i < EnumDyeColor.values().length; ++i) {
+		for (int i = 0; i < EnumDyeColor.META_LOOKUP.length; ++i) {
 			list.add(new ItemStack(item, 1, i));
 		}
 
diff --git a/src/main/java/net/minecraft/block/BlockStairs.java b/src/main/java/net/minecraft/block/BlockStairs.java
index a14b944..dc1cf48 100755
--- a/src/main/java/net/minecraft/block/BlockStairs.java
+++ b/src/main/java/net/minecraft/block/BlockStairs.java
@@ -587,14 +587,15 @@ public class BlockStairs extends Block {
 			}
 		}
 
-		for (int k : aint) {
-			amovingobjectposition[k] = null;
+		for (int l = 0; l < aint.length; ++l) {
+			amovingobjectposition[aint[l]] = null;
 		}
 
 		MovingObjectPosition movingobjectposition1 = null;
 		double d1 = 0.0D;
 
-		for (MovingObjectPosition movingobjectposition : amovingobjectposition) {
+		for (int l = 0; l < amovingobjectposition.length; ++l) {
+			MovingObjectPosition movingobjectposition = amovingobjectposition[l];
 			if (movingobjectposition != null) {
 				double d0 = movingobjectposition.hitVec.squareDistanceTo(vec31);
 				if (d0 > d1) {
diff --git a/src/main/java/net/minecraft/block/BlockStaticLiquid.java b/src/main/java/net/minecraft/block/BlockStaticLiquid.java
index 765dabb..e1d9503 100755
--- a/src/main/java/net/minecraft/block/BlockStaticLiquid.java
+++ b/src/main/java/net/minecraft/block/BlockStaticLiquid.java
@@ -88,7 +88,9 @@ public class BlockStaticLiquid extends BlockLiquid {
 	}
 
 	protected boolean isSurroundingBlockFlammable(World worldIn, BlockPos pos) {
-		for (EnumFacing enumfacing : EnumFacing.values()) {
+		EnumFacing[] facings = EnumFacing._VALUES;
+		for (int i = 0; i < facings.length; ++i) {
+			EnumFacing enumfacing = facings[i];
 			if (this.getCanBlockBurn(worldIn, pos.offset(enumfacing))) {
 				return true;
 			}
diff --git a/src/main/java/net/minecraft/block/BlockStem.java b/src/main/java/net/minecraft/block/BlockStem.java
index 8e6f2bc..2c0f7ee 100755
--- a/src/main/java/net/minecraft/block/BlockStem.java
+++ b/src/main/java/net/minecraft/block/BlockStem.java
@@ -68,8 +68,11 @@ public class BlockStem extends BlockBush implements IGrowable {
 	public IBlockState getActualState(IBlockState iblockstate, IBlockAccess iblockaccess, BlockPos blockpos) {
 		iblockstate = iblockstate.withProperty(FACING, EnumFacing.UP);
 
-		for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) {
-			if (iblockaccess.getBlockState(blockpos.offset(enumfacing)).getBlock() == this.crop) {
+		BlockPos tmp = new BlockPos(0, 0, 0);
+		EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+		for (int i = 0; i < facings.length; ++i) {
+			EnumFacing enumfacing = facings[i];
+			if (iblockaccess.getBlockState(blockpos.offsetEvenFaster(enumfacing, tmp)).getBlock() == this.crop) {
 				iblockstate = iblockstate.withProperty(FACING, enumfacing);
 				break;
 			}
@@ -95,8 +98,9 @@ public class BlockStem extends BlockBush implements IGrowable {
 					iblockstate = iblockstate.withProperty(AGE, Integer.valueOf(i + 1));
 					world.setBlockState(blockpos, iblockstate, 2);
 				} else {
-					for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) {
-						if (world.getBlockState(blockpos.offset(enumfacing)).getBlock() == this.crop) {
+					EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+					for (int j = 0; j < facings.length; ++j) {
+						if (world.getBlockState(blockpos.offset(facings[j])).getBlock() == this.crop) {
 							return;
 						}
 					}
diff --git a/src/main/java/net/minecraft/block/BlockStone.java b/src/main/java/net/minecraft/block/BlockStone.java
index 78ef78d..0978de1 100755
--- a/src/main/java/net/minecraft/block/BlockStone.java
+++ b/src/main/java/net/minecraft/block/BlockStone.java
@@ -88,8 +88,9 @@ public class BlockStone extends Block {
 	 * (eg: wood returns 4 blocks)
 	 */
 	public void getSubBlocks(Item item, CreativeTabs var2, List<ItemStack> list) {
-		for (BlockStone.EnumType blockstone$enumtype : BlockStone.EnumType.values()) {
-			list.add(new ItemStack(item, 1, blockstone$enumtype.getMetadata()));
+		BlockStone.EnumType[] types = BlockStone.EnumType.META_LOOKUP;
+		for (int i = 0; i < types.length; ++i) {
+			list.add(new ItemStack(item, 1, types[i].getMetadata()));
 		}
 
 	}
@@ -120,7 +121,7 @@ public class BlockStone extends Block {
 		ANDESITE(5, MapColor.stoneColor, "andesite"),
 		ANDESITE_SMOOTH(6, MapColor.stoneColor, "smooth_andesite", "andesiteSmooth");
 
-		private static final BlockStone.EnumType[] META_LOOKUP = new BlockStone.EnumType[values().length];
+		public static final BlockStone.EnumType[] META_LOOKUP = new BlockStone.EnumType[7];
 		private final int meta;
 		private final String name;
 		private final String unlocalizedName;
@@ -166,8 +167,9 @@ public class BlockStone extends Block {
 		}
 
 		static {
-			for (BlockStone.EnumType blockstone$enumtype : values()) {
-				META_LOOKUP[blockstone$enumtype.getMetadata()] = blockstone$enumtype;
+			BlockStone.EnumType[] types = values();
+			for (int i = 0; i < types.length; ++i) {
+				META_LOOKUP[types[i].getMetadata()] = types[i];
 			}
 
 		}
diff --git a/src/main/java/net/minecraft/block/BlockStoneBrick.java b/src/main/java/net/minecraft/block/BlockStoneBrick.java
index ba15f29..136e9f3 100755
--- a/src/main/java/net/minecraft/block/BlockStoneBrick.java
+++ b/src/main/java/net/minecraft/block/BlockStoneBrick.java
@@ -64,8 +64,9 @@ public class BlockStoneBrick extends Block {
 	 * (eg: wood returns 4 blocks)
 	 */
 	public void getSubBlocks(Item item, CreativeTabs var2, List<ItemStack> list) {
-		for (BlockStoneBrick.EnumType blockstonebrick$enumtype : BlockStoneBrick.EnumType.values()) {
-			list.add(new ItemStack(item, 1, blockstonebrick$enumtype.getMetadata()));
+		BlockStoneBrick.EnumType[] types = BlockStoneBrick.EnumType.META_LOOKUP;
+		for (int i = 0; i < types.length; ++i) {
+			list.add(new ItemStack(item, 1, types[i].getMetadata()));
 		}
 
 	}
@@ -92,7 +93,7 @@ public class BlockStoneBrick extends Block {
 		DEFAULT(0, "stonebrick", "default"), MOSSY(1, "mossy_stonebrick", "mossy"),
 		CRACKED(2, "cracked_stonebrick", "cracked"), CHISELED(3, "chiseled_stonebrick", "chiseled");
 
-		private static final BlockStoneBrick.EnumType[] META_LOOKUP = new BlockStoneBrick.EnumType[values().length];
+		public static final BlockStoneBrick.EnumType[] META_LOOKUP = new BlockStoneBrick.EnumType[4];
 		private final int meta;
 		private final String name;
 		private final String unlocalizedName;
@@ -128,8 +129,9 @@ public class BlockStoneBrick extends Block {
 		}
 
 		static {
-			for (BlockStoneBrick.EnumType blockstonebrick$enumtype : values()) {
-				META_LOOKUP[blockstonebrick$enumtype.getMetadata()] = blockstonebrick$enumtype;
+			BlockStoneBrick.EnumType[] types = values();
+			for (int i = 0; i < types.length; ++i) {
+				META_LOOKUP[types[i].getMetadata()] = types[i];
 			}
 
 		}
diff --git a/src/main/java/net/minecraft/block/BlockStoneSlab.java b/src/main/java/net/minecraft/block/BlockStoneSlab.java
index 263f0cf..10a5547 100755
--- a/src/main/java/net/minecraft/block/BlockStoneSlab.java
+++ b/src/main/java/net/minecraft/block/BlockStoneSlab.java
@@ -91,7 +91,9 @@ public abstract class BlockStoneSlab extends BlockSlab {
 	 */
 	public void getSubBlocks(Item item, CreativeTabs var2, List<ItemStack> list) {
 		if (item != Item.getItemFromBlock(Blocks.double_stone_slab)) {
-			for (BlockStoneSlab.EnumType blockstoneslab$enumtype : BlockStoneSlab.EnumType.values()) {
+			BlockStoneSlab.EnumType[] types = BlockStoneSlab.EnumType.META_LOOKUP;
+			for (int i = 0; i < types.length; ++i) {
+				BlockStoneSlab.EnumType blockstoneslab$enumtype = types[i];
 				if (blockstoneslab$enumtype != BlockStoneSlab.EnumType.WOOD) {
 					list.add(new ItemStack(item, 1, blockstoneslab$enumtype.getMetadata()));
 				}
@@ -162,7 +164,7 @@ public abstract class BlockStoneSlab extends BlockSlab {
 		NETHERBRICK(6, MapColor.netherrackColor, "nether_brick", "netherBrick"),
 		QUARTZ(7, MapColor.quartzColor, "quartz");
 
-		private static final BlockStoneSlab.EnumType[] META_LOOKUP = new BlockStoneSlab.EnumType[values().length];
+		public static final BlockStoneSlab.EnumType[] META_LOOKUP = new BlockStoneSlab.EnumType[8];
 		private final int meta;
 		private final MapColor field_181075_k;
 		private final String name;
@@ -211,8 +213,9 @@ public abstract class BlockStoneSlab extends BlockSlab {
 		}
 
 		static {
-			for (BlockStoneSlab.EnumType blockstoneslab$enumtype : values()) {
-				META_LOOKUP[blockstoneslab$enumtype.getMetadata()] = blockstoneslab$enumtype;
+			BlockStoneSlab.EnumType[] types = values();
+			for (int i = 0; i < types.length; ++i) {
+				META_LOOKUP[types[i].getMetadata()] = types[i];
 			}
 
 		}
diff --git a/src/main/java/net/minecraft/block/BlockStoneSlabNew.java b/src/main/java/net/minecraft/block/BlockStoneSlabNew.java
index b76fa6a..00c8ad6 100755
--- a/src/main/java/net/minecraft/block/BlockStoneSlabNew.java
+++ b/src/main/java/net/minecraft/block/BlockStoneSlabNew.java
@@ -100,8 +100,9 @@ public abstract class BlockStoneSlabNew extends BlockSlab {
 	 */
 	public void getSubBlocks(Item item, CreativeTabs var2, List<ItemStack> list) {
 		if (item != Item.getItemFromBlock(Blocks.double_stone_slab2)) {
-			for (BlockStoneSlabNew.EnumType blockstoneslabnew$enumtype : BlockStoneSlabNew.EnumType.values()) {
-				list.add(new ItemStack(item, 1, blockstoneslabnew$enumtype.getMetadata()));
+			BlockStoneSlabNew.EnumType[] types = BlockStoneSlabNew.EnumType.META_LOOKUP;
+			for (int i = 0; i < types.length; ++i) {
+				list.add(new ItemStack(item, 1, types[i].getMetadata()));
 			}
 
 		}
@@ -165,7 +166,7 @@ public abstract class BlockStoneSlabNew extends BlockSlab {
 	public static enum EnumType implements IStringSerializable {
 		RED_SANDSTONE(0, "red_sandstone", BlockSand.EnumType.RED_SAND.getMapColor());
 
-		private static final BlockStoneSlabNew.EnumType[] META_LOOKUP = new BlockStoneSlabNew.EnumType[values().length];
+		public static final BlockStoneSlabNew.EnumType[] META_LOOKUP = new BlockStoneSlabNew.EnumType[1];
 		private final int meta;
 		private final String name;
 		private final MapColor field_181069_e;
@@ -208,8 +209,9 @@ public abstract class BlockStoneSlabNew extends BlockSlab {
 		}
 
 		static {
-			for (BlockStoneSlabNew.EnumType blockstoneslabnew$enumtype : values()) {
-				META_LOOKUP[blockstoneslabnew$enumtype.getMetadata()] = blockstoneslabnew$enumtype;
+			BlockStoneSlabNew.EnumType[] types = values();
+			for (int i = 0; i < types.length; ++i) {
+				META_LOOKUP[types[i].getMetadata()] = types[i];
 			}
 
 		}
diff --git a/src/main/java/net/minecraft/block/BlockTallGrass.java b/src/main/java/net/minecraft/block/BlockTallGrass.java
index 494a343..36d77fc 100755
--- a/src/main/java/net/minecraft/block/BlockTallGrass.java
+++ b/src/main/java/net/minecraft/block/BlockTallGrass.java
@@ -181,7 +181,7 @@ public class BlockTallGrass extends BlockBush implements IGrowable {
 	public static enum EnumType implements IStringSerializable {
 		DEAD_BUSH(0, "dead_bush"), GRASS(1, "tall_grass"), FERN(2, "fern");
 
-		private static final BlockTallGrass.EnumType[] META_LOOKUP = new BlockTallGrass.EnumType[values().length];
+		private static final BlockTallGrass.EnumType[] META_LOOKUP = new BlockTallGrass.EnumType[3];
 		private final int meta;
 		private final String name;
 
@@ -211,8 +211,9 @@ public class BlockTallGrass extends BlockBush implements IGrowable {
 		}
 
 		static {
-			for (BlockTallGrass.EnumType blocktallgrass$enumtype : values()) {
-				META_LOOKUP[blocktallgrass$enumtype.getMeta()] = blocktallgrass$enumtype;
+			BlockTallGrass.EnumType[] types = values();
+			for (int i = 0; i < types.length; ++i) {
+				META_LOOKUP[types[i].getMeta()] = types[i];
 			}
 
 		}
diff --git a/src/main/java/net/minecraft/block/BlockTorch.java b/src/main/java/net/minecraft/block/BlockTorch.java
index 12ebc9b..633b213 100755
--- a/src/main/java/net/minecraft/block/BlockTorch.java
+++ b/src/main/java/net/minecraft/block/BlockTorch.java
@@ -107,7 +107,9 @@ public class BlockTorch extends Block {
 		if (this.canPlaceAt(world, blockpos, enumfacing)) {
 			return this.getDefaultState().withProperty(FACING, enumfacing);
 		} else {
-			for (EnumFacing enumfacing1 : EnumFacing.Plane.HORIZONTAL) {
+			EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+			for (int i = 0; i < facings.length; ++i) {
+				EnumFacing enumfacing1 = facings[i];
 				if (world.isBlockNormalCube(blockpos.offset(enumfacing1.getOpposite()), true)) {
 					return this.getDefaultState().withProperty(FACING, enumfacing1);
 				}
diff --git a/src/main/java/net/minecraft/block/BlockTripWire.java b/src/main/java/net/minecraft/block/BlockTripWire.java
index c4e8d31..b9eb57b 100755
--- a/src/main/java/net/minecraft/block/BlockTripWire.java
+++ b/src/main/java/net/minecraft/block/BlockTripWire.java
@@ -206,13 +206,13 @@ public class BlockTripWire extends Block {
 		IBlockState iblockstate = worldIn.getBlockState(pos);
 		boolean flag = ((Boolean) iblockstate.getValue(POWERED)).booleanValue();
 		boolean flag1 = false;
-		List list = worldIn.getEntitiesWithinAABBExcludingEntity((Entity) null,
+		List<Entity> list = worldIn.getEntitiesWithinAABBExcludingEntity((Entity) null,
 				new AxisAlignedBB((double) pos.getX() + this.minX, (double) pos.getY() + this.minY,
 						(double) pos.getZ() + this.minZ, (double) pos.getX() + this.maxX,
 						(double) pos.getY() + this.maxY, (double) pos.getZ() + this.maxZ));
 		if (!list.isEmpty()) {
-			for (Entity entity : (List<Entity>) list) {
-				if (!entity.doesEntityNotTriggerPressurePlate()) {
+			for (int i = 0, l = list.size(); i < l; ++i) {
+				if (!list.get(i).doesEntityNotTriggerPressurePlate()) {
 					flag1 = true;
 					break;
 				}
diff --git a/src/main/java/net/minecraft/block/BlockTripWireHook.java b/src/main/java/net/minecraft/block/BlockTripWireHook.java
index d34e056..dcfa9fe 100755
--- a/src/main/java/net/minecraft/block/BlockTripWireHook.java
+++ b/src/main/java/net/minecraft/block/BlockTripWireHook.java
@@ -91,8 +91,10 @@ public class BlockTripWireHook extends Block {
 	}
 
 	public boolean canPlaceBlockAt(World world, BlockPos blockpos) {
-		for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) {
-			if (world.getBlockState(blockpos.offset(enumfacing)).getBlock().isNormalCube()) {
+		EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+		BlockPos tmp = new BlockPos(0, 0, 0);
+		for (int i = 0; i < facings.length; ++i) {
+			if (world.getBlockState(blockpos.offsetEvenFaster(facings[i], tmp)).getBlock().isNormalCube()) {
 				return true;
 			}
 		}
diff --git a/src/main/java/net/minecraft/block/BlockVine.java b/src/main/java/net/minecraft/block/BlockVine.java
index 5e74e2c..c807bba 100755
--- a/src/main/java/net/minecraft/block/BlockVine.java
+++ b/src/main/java/net/minecraft/block/BlockVine.java
@@ -187,11 +187,14 @@ public class BlockVine extends Block {
 	private boolean recheckGrownSides(World worldIn, BlockPos pos, IBlockState state) {
 		IBlockState iblockstate = state;
 
-		for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) {
+		BlockPos tmp = new BlockPos(0, 0, 0);
+		EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+		for (int i = 0; i < facings.length; ++i) {
+			EnumFacing enumfacing = facings[i];
 			PropertyBool propertybool = getPropertyFor(enumfacing);
 			if (((Boolean) state.getValue(propertybool)).booleanValue()
-					&& !this.canPlaceOn(worldIn.getBlockState(pos.offset(enumfacing)).getBlock())) {
-				IBlockState iblockstate1 = worldIn.getBlockState(pos.up());
+					&& !this.canPlaceOn(worldIn.getBlockState(pos.offsetEvenFaster(enumfacing, tmp)).getBlock())) {
+				IBlockState iblockstate1 = worldIn.getBlockState(pos.offsetEvenFaster(EnumFacing.UP, tmp));
 				if (iblockstate1.getBlock() != this
 						|| !((Boolean) iblockstate1.getValue(propertybool)).booleanValue()) {
 					state = state.withProperty(propertybool, Boolean.valueOf(false));
@@ -256,13 +259,16 @@ public class BlockVine extends Block {
 
 				EnumFacing enumfacing1 = EnumFacing.random(random);
 				BlockPos blockpos2 = blockpos.up();
+				BlockPos tmp = new BlockPos(0, 0, 0);
 				if (enumfacing1 == EnumFacing.UP && blockpos.getY() < 255 && world.isAirBlock(blockpos2)) {
 					if (!flag) {
 						IBlockState iblockstate3 = iblockstate;
 
-						for (EnumFacing enumfacing3 : EnumFacing.Plane.HORIZONTAL) {
-							if (random.nextBoolean() || !this
-									.canPlaceOn(world.getBlockState(blockpos2.offset(enumfacing3)).getBlock())) {
+						EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+						for (int j = 0; j < facings.length; ++j) {
+							EnumFacing enumfacing3 = facings[j];
+							if (random.nextBoolean() || !this.canPlaceOn(
+									world.getBlockState(blockpos2.offsetEvenFaster(enumfacing3, tmp)).getBlock())) {
 								iblockstate3 = iblockstate3.withProperty(getPropertyFor(enumfacing3),
 										Boolean.valueOf(false));
 							}
@@ -296,12 +302,12 @@ public class BlockVine extends Block {
 							} else if (flag2 && this.canPlaceOn(world.getBlockState(blockpos1).getBlock())) {
 								world.setBlockState(blockpos4, this.getDefaultState()
 										.withProperty(getPropertyFor(enumfacing4), Boolean.valueOf(true)), 2);
-							} else if (flag1 && world.isAirBlock(blockpos5)
-									&& this.canPlaceOn(world.getBlockState(blockpos.offset(enumfacing2)).getBlock())) {
+							} else if (flag1 && world.isAirBlock(blockpos5) && this.canPlaceOn(
+									world.getBlockState(blockpos.offsetEvenFaster(enumfacing2, tmp)).getBlock())) {
 								world.setBlockState(blockpos5, this.getDefaultState().withProperty(
 										getPropertyFor(enumfacing1.getOpposite()), Boolean.valueOf(true)), 2);
-							} else if (flag2 && world.isAirBlock(blockpos1)
-									&& this.canPlaceOn(world.getBlockState(blockpos.offset(enumfacing4)).getBlock())) {
+							} else if (flag2 && world.isAirBlock(blockpos1) && this.canPlaceOn(
+									world.getBlockState(blockpos.offsetEvenFaster(enumfacing4, tmp)).getBlock())) {
 								world.setBlockState(blockpos1, this.getDefaultState().withProperty(
 										getPropertyFor(enumfacing1.getOpposite()), Boolean.valueOf(true)), 2);
 							} else if (this.canPlaceOn(world.getBlockState(blockpos4.up()).getBlock())) {
@@ -318,12 +324,13 @@ public class BlockVine extends Block {
 						BlockPos blockpos3 = blockpos.down();
 						IBlockState iblockstate1 = world.getBlockState(blockpos3);
 						Block block = iblockstate1.getBlock();
+						EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
 						if (block.blockMaterial == Material.air) {
 							IBlockState iblockstate2 = iblockstate;
 
-							for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) {
+							for (int j = 0; j < facings.length; ++j) {
 								if (random.nextBoolean()) {
-									iblockstate2 = iblockstate2.withProperty(getPropertyFor(enumfacing),
+									iblockstate2 = iblockstate2.withProperty(getPropertyFor(facings[j]),
 											Boolean.valueOf(false));
 								}
 							}
@@ -337,8 +344,8 @@ public class BlockVine extends Block {
 						} else if (block == this) {
 							IBlockState iblockstate4 = iblockstate1;
 
-							for (EnumFacing enumfacing5 : EnumFacing.Plane.HORIZONTAL) {
-								PropertyBool propertybool = getPropertyFor(enumfacing5);
+							for (int j = 0; j < facings.length; ++j) {
+								PropertyBool propertybool = getPropertyFor(facings[j]);
 								if (random.nextBoolean()
 										&& ((Boolean) iblockstate.getValue(propertybool)).booleanValue()) {
 									iblockstate4 = iblockstate4.withProperty(propertybool, Boolean.valueOf(true));
@@ -459,8 +466,8 @@ public class BlockVine extends Block {
 	public static int getNumGrownFaces(IBlockState state) {
 		int i = 0;
 
-		for (PropertyBool propertybool : ALL_FACES) {
-			if (((Boolean) state.getValue(propertybool)).booleanValue()) {
+		for (int j = 0; j < ALL_FACES.length; ++j) {
+			if (((Boolean) state.getValue(ALL_FACES[j])).booleanValue()) {
 				++i;
 			}
 		}
diff --git a/src/main/java/net/minecraft/block/BlockWall.java b/src/main/java/net/minecraft/block/BlockWall.java
index 5c814c8..1e25999 100755
--- a/src/main/java/net/minecraft/block/BlockWall.java
+++ b/src/main/java/net/minecraft/block/BlockWall.java
@@ -148,8 +148,9 @@ public class BlockWall extends Block {
 	 * (eg: wood returns 4 blocks)
 	 */
 	public void getSubBlocks(Item item, CreativeTabs var2, List<ItemStack> list) {
-		for (BlockWall.EnumType blockwall$enumtype : BlockWall.EnumType.values()) {
-			list.add(new ItemStack(item, 1, blockwall$enumtype.getMetadata()));
+		BlockWall.EnumType[] types = BlockWall.EnumType.META_LOOKUP;
+		for (int i = 0; i < types.length; ++i) {
+			list.add(new ItemStack(item, 1, types[i].getMetadata()));
 		}
 
 	}
@@ -202,7 +203,7 @@ public class BlockWall extends Block {
 	public static enum EnumType implements IStringSerializable {
 		NORMAL(0, "cobblestone", "normal"), MOSSY(1, "mossy_cobblestone", "mossy");
 
-		private static final BlockWall.EnumType[] META_LOOKUP = new BlockWall.EnumType[values().length];
+		public static final BlockWall.EnumType[] META_LOOKUP = new BlockWall.EnumType[2];
 		private final int meta;
 		private final String name;
 		private String unlocalizedName;
@@ -238,8 +239,9 @@ public class BlockWall extends Block {
 		}
 
 		static {
-			for (BlockWall.EnumType blockwall$enumtype : values()) {
-				META_LOOKUP[blockwall$enumtype.getMetadata()] = blockwall$enumtype;
+			BlockWall.EnumType[] types = values();
+			for (int i = 0; i < types.length; ++i) {
+				META_LOOKUP[types[i].getMetadata()] = types[i];
 			}
 
 		}
diff --git a/src/main/java/net/minecraft/block/BlockWoodSlab.java b/src/main/java/net/minecraft/block/BlockWoodSlab.java
index c648884..ade4b63 100755
--- a/src/main/java/net/minecraft/block/BlockWoodSlab.java
+++ b/src/main/java/net/minecraft/block/BlockWoodSlab.java
@@ -93,8 +93,9 @@ public abstract class BlockWoodSlab extends BlockSlab {
 	 */
 	public void getSubBlocks(Item item, CreativeTabs var2, List<ItemStack> list) {
 		if (item != Item.getItemFromBlock(Blocks.double_wooden_slab)) {
-			for (BlockPlanks.EnumType blockplanks$enumtype : BlockPlanks.EnumType.values()) {
-				list.add(new ItemStack(item, 1, blockplanks$enumtype.getMetadata()));
+			BlockPlanks.EnumType[] types = BlockPlanks.EnumType.META_LOOKUP;
+			for (int i = 0; i < types.length; ++i) {
+				list.add(new ItemStack(item, 1, types[i].getMetadata()));
 			}
 
 		}
diff --git a/src/main/java/net/minecraft/block/properties/PropertyDirection.java b/src/main/java/net/minecraft/block/properties/PropertyDirection.java
index f0c3c70..9cc316e 100755
--- a/src/main/java/net/minecraft/block/properties/PropertyDirection.java
+++ b/src/main/java/net/minecraft/block/properties/PropertyDirection.java
@@ -51,7 +51,7 @@ public class PropertyDirection extends PropertyEnum<EnumFacing> {
 		/**+
 		 * Create a new PropertyDirection with the given name
 		 */
-		return create(name, Collections2.filter(Lists.newArrayList(EnumFacing.values()), filter));
+		return create(name, Collections2.filter(Lists.newArrayList(EnumFacing._VALUES), filter));
 	}
 
 	/**+
diff --git a/src/main/java/net/minecraft/block/state/BlockPistonStructureHelper.java b/src/main/java/net/minecraft/block/state/BlockPistonStructureHelper.java
index fa1c998..3c5dfc2 100755
--- a/src/main/java/net/minecraft/block/state/BlockPistonStructureHelper.java
+++ b/src/main/java/net/minecraft/block/state/BlockPistonStructureHelper.java
@@ -185,7 +185,9 @@ public class BlockPistonStructureHelper {
 	}
 
 	private boolean func_177250_b(BlockPos parBlockPos) {
-		for (EnumFacing enumfacing : EnumFacing.values()) {
+		EnumFacing[] facings = EnumFacing._VALUES;
+		for (int i = 0; i < facings.length; ++i) {
+			EnumFacing enumfacing = facings[i];
 			if (enumfacing.getAxis() != this.moveDirection.getAxis()
 					&& !this.func_177251_a(parBlockPos.offset(enumfacing))) {
 				return false;
diff --git a/src/main/java/net/minecraft/block/state/pattern/BlockPattern.java b/src/main/java/net/minecraft/block/state/pattern/BlockPattern.java
index 52f78ea..2bd9330 100755
--- a/src/main/java/net/minecraft/block/state/pattern/BlockPattern.java
+++ b/src/main/java/net/minecraft/block/state/pattern/BlockPattern.java
@@ -92,8 +92,11 @@ public class BlockPattern {
 		int i = Math.max(Math.max(this.palmLength, this.thumbLength), this.fingerLength);
 
 		for (BlockPos blockpos : BlockPos.getAllInBox(pos, pos.add(i - 1, i - 1, i - 1))) {
-			for (EnumFacing enumfacing : EnumFacing.values()) {
-				for (EnumFacing enumfacing1 : EnumFacing.values()) {
+			EnumFacing[] facings = EnumFacing._VALUES;
+			for (int j = 0; j < facings.length; ++j) {
+				EnumFacing enumfacing = facings[j];
+				for (int k = 0; k < facings.length; ++k) {
+					EnumFacing enumfacing1 = facings[k];
 					if (enumfacing1 != enumfacing && enumfacing1 != enumfacing.getOpposite()) {
 						BlockPattern.PatternHelper blockpattern$patternhelper = this.checkPatternAt(blockpos,
 								enumfacing, enumfacing1, loadingcache);
diff --git a/src/main/java/net/minecraft/block/state/pattern/FactoryBlockPattern.java b/src/main/java/net/minecraft/block/state/pattern/FactoryBlockPattern.java
index df42006..bd88203 100755
--- a/src/main/java/net/minecraft/block/state/pattern/FactoryBlockPattern.java
+++ b/src/main/java/net/minecraft/block/state/pattern/FactoryBlockPattern.java
@@ -1,6 +1,5 @@
 package net.minecraft.block.state.pattern;
 
-import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -58,14 +57,17 @@ public class FactoryBlockPattern {
 				throw new IllegalArgumentException("Expected aisle with height of " + this.aisleHeight
 						+ ", but was given one with a height of " + aisle.length + ")");
 			} else {
-				for (String s : aisle) {
+				for (int i = 0; i < aisle.length; ++i) {
+					String s = aisle[i];
 					if (s.length() != this.rowWidth) {
 						throw new IllegalArgumentException(
 								"Not all rows in the given aisle are the correct width (expected " + this.rowWidth
 										+ ", found one with " + s.length() + ")");
 					}
 
-					for (char c0 : s.toCharArray()) {
+					char[] achar = s.toCharArray();
+					for (int j = 0; j < achar.length; ++j) {
+						char c0 = achar[j];
 						if (!this.symbolMap.containsKey(Character.valueOf(c0))) {
 							this.symbolMap.put(Character.valueOf(c0), null);
 						}
diff --git a/src/main/java/net/minecraft/client/Minecraft.java b/src/main/java/net/minecraft/client/Minecraft.java
index 1b447db..5e7529c 100755
--- a/src/main/java/net/minecraft/client/Minecraft.java
+++ b/src/main/java/net/minecraft/client/Minecraft.java
@@ -34,6 +34,7 @@ import net.lax1dude.eaglercraft.v1_8.internal.EnumPlatformType;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerFolderResourcePack;
 import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerFontRenderer;
 import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
@@ -74,7 +75,6 @@ import net.minecraft.client.gui.GuiGameOver;
 import net.minecraft.client.gui.GuiIngame;
 import net.minecraft.client.gui.GuiIngameMenu;
 import net.minecraft.client.gui.GuiMainMenu;
-import net.minecraft.client.gui.GuiMemoryErrorScreen;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.GuiSleepMP;
 import net.minecraft.client.gui.ScaledResolution;
@@ -384,6 +384,7 @@ public class Minecraft implements IThreadListener {
 		logger.info("EagRuntime Version: " + EagRuntime.getVersion());
 		this.createDisplay();
 		this.registerMetadataSerializers();
+		EaglerFolderResourcePack.deleteOldResourcePacks(EaglerFolderResourcePack.SERVER_RESOURCE_PACKS, 604800000L);
 		this.mcResourcePackRepository = new ResourcePackRepository(this.mcDefaultResourcePack, this.metadataSerializer_,
 				this.gameSettings);
 		this.mcResourceManager = new SimpleReloadableResourceManager(this.metadataSerializer_);
@@ -696,7 +697,7 @@ public class Minecraft implements IThreadListener {
 		if (SingleplayerServerController.shutdownEaglercraftServer()
 				|| SingleplayerServerController.getStatusState() == IntegratedServerState.WORLD_UNLOADING) {
 			displayGuiScreen(new GuiScreenIntegratedServerBusy(cont, "singleplayer.busy.stoppingIntegratedServer",
-					"singleplayer.failed.stoppingIntegratedServer", () -> SingleplayerServerController.isReady()));
+					"singleplayer.failed.stoppingIntegratedServer", SingleplayerServerController::isReady));
 		} else {
 			displayGuiScreen(cont);
 		}
@@ -1703,8 +1704,7 @@ public class Minecraft implements IThreadListener {
 				if (SingleplayerServerController.hangupEaglercraftServer()) {
 					this.displayGuiScreen(new GuiScreenIntegratedServerBusy(currentScreen,
 							"singleplayer.busy.stoppingIntegratedServer",
-							"singleplayer.failed.stoppingIntegratedServer",
-							() -> SingleplayerServerController.isReady()));
+							"singleplayer.failed.stoppingIntegratedServer", SingleplayerServerController::isReady));
 				}
 			}
 		}
diff --git a/src/main/java/net/minecraft/client/audio/SoundCategory.java b/src/main/java/net/minecraft/client/audio/SoundCategory.java
index 2a2ce71..7bebd72 100755
--- a/src/main/java/net/minecraft/client/audio/SoundCategory.java
+++ b/src/main/java/net/minecraft/client/audio/SoundCategory.java
@@ -28,6 +28,8 @@ public enum SoundCategory {
 	MASTER("master", 0), MUSIC("music", 1), RECORDS("record", 2), WEATHER("weather", 3), BLOCKS("block", 4),
 	MOBS("hostile", 5), ANIMALS("neutral", 6), PLAYERS("player", 7), AMBIENT("ambient", 8), VOICE("voice", 9);
 
+	public static final SoundCategory[] _VALUES = values();
+
 	private static final Map<String, SoundCategory> NAME_CATEGORY_MAP = Maps.newHashMap();
 	private static final Map<Integer, SoundCategory> ID_CATEGORY_MAP = Maps.newHashMap();
 	private final String categoryName;
@@ -51,7 +53,9 @@ public enum SoundCategory {
 	}
 
 	static {
-		for (SoundCategory soundcategory : values()) {
+		SoundCategory[] categories = _VALUES;
+		for (int i = 0; i < categories.length; ++i) {
+			SoundCategory soundcategory = categories[i];
 			if (NAME_CATEGORY_MAP.containsKey(soundcategory.getCategoryName())
 					|| ID_CATEGORY_MAP.containsKey(Integer.valueOf(soundcategory.getCategoryId()))) {
 				throw new Error("Clash in Sound Category ID & Name pools! Cannot insert " + soundcategory);
diff --git a/src/main/java/net/minecraft/client/audio/SoundEventAccessorComposite.java b/src/main/java/net/minecraft/client/audio/SoundEventAccessorComposite.java
index 9970bba..3911f6a 100755
--- a/src/main/java/net/minecraft/client/audio/SoundEventAccessorComposite.java
+++ b/src/main/java/net/minecraft/client/audio/SoundEventAccessorComposite.java
@@ -49,8 +49,8 @@ public class SoundEventAccessorComposite implements ISoundEventAccessor<SoundPoo
 	public int getWeight() {
 		int i = 0;
 
-		for (ISoundEventAccessor isoundeventaccessor : this.soundPool) {
-			i += isoundeventaccessor.getWeight();
+		for (int j = 0, l = this.soundPool.size(); j < l; ++j) {
+			i += this.soundPool.get(j).getWeight();
 		}
 
 		return i;
@@ -61,7 +61,8 @@ public class SoundEventAccessorComposite implements ISoundEventAccessor<SoundPoo
 		if (!this.soundPool.isEmpty() && i != 0) {
 			int j = this.rnd.nextInt(i);
 
-			for (ISoundEventAccessor isoundeventaccessor : this.soundPool) {
+			for (int k = 0, l = this.soundPool.size(); k < l; ++k) {
+				ISoundEventAccessor isoundeventaccessor = this.soundPool.get(k);
 				j -= isoundeventaccessor.getWeight();
 				if (j < 0) {
 					SoundPoolEntry soundpoolentry = (SoundPoolEntry) isoundeventaccessor.cloneEntry();
diff --git a/src/main/java/net/minecraft/client/audio/SoundList.java b/src/main/java/net/minecraft/client/audio/SoundList.java
index a8c6e4d..87e26fc 100755
--- a/src/main/java/net/minecraft/client/audio/SoundList.java
+++ b/src/main/java/net/minecraft/client/audio/SoundList.java
@@ -115,9 +115,10 @@ public class SoundList {
 			}
 
 			public static SoundList.SoundEntry.Type getType(String parString1) {
-				for (SoundList.SoundEntry.Type soundlist$soundentry$type : values()) {
-					if (soundlist$soundentry$type.field_148583_c.equals(parString1)) {
-						return soundlist$soundentry$type;
+				SoundList.SoundEntry.Type[] types = values();
+				for (int i = 0; i < types.length; ++i) {
+					if (types[i].field_148583_c.equals(parString1)) {
+						return types[i];
 					}
 				}
 
diff --git a/src/main/java/net/minecraft/client/entity/EntityPlayerSP.java b/src/main/java/net/minecraft/client/entity/EntityPlayerSP.java
index 3bc8ae5..8810db5 100755
--- a/src/main/java/net/minecraft/client/entity/EntityPlayerSP.java
+++ b/src/main/java/net/minecraft/client/entity/EntityPlayerSP.java
@@ -1,8 +1,6 @@
 package net.minecraft.client.entity;
 
-import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController;
 import net.lax1dude.eaglercraft.v1_8.sp.lan.LANClientNetworkManager;
-import net.lax1dude.eaglercraft.v1_8.sp.lan.LANServerController;
 import net.lax1dude.eaglercraft.v1_8.sp.socket.ClientIntegratedServerNetworkManager;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.MovingSoundMinecartRiding;
diff --git a/src/main/java/net/minecraft/client/gui/FontRenderer.java b/src/main/java/net/minecraft/client/gui/FontRenderer.java
index 85cc142..6da85c2 100755
--- a/src/main/java/net/minecraft/client/gui/FontRenderer.java
+++ b/src/main/java/net/minecraft/client/gui/FontRenderer.java
@@ -680,8 +680,9 @@ public class FontRenderer implements IResourceManagerReloadListener {
 	 * wordwrap and with darker drop shadow color if flag is set
 	 */
 	private void renderSplitString(String str, int x, int y, int wrapWidth, boolean addShadow) {
-		for (String s : this.listFormattedStringToWidth(str, wrapWidth)) {
-			this.renderStringAligned(s, x, y, wrapWidth, this.textColor, addShadow);
+		List<String> lst = this.listFormattedStringToWidth(str, wrapWidth);
+		for (int i = 0, l = lst.size(); i < l; ++i) {
+			this.renderStringAligned(lst.get(i), x, y, wrapWidth, this.textColor, addShadow);
 			y += this.FONT_HEIGHT;
 		}
 
diff --git a/src/main/java/net/minecraft/client/gui/GuiChat.java b/src/main/java/net/minecraft/client/gui/GuiChat.java
index 7a3a8ed..106cb9a 100755
--- a/src/main/java/net/minecraft/client/gui/GuiChat.java
+++ b/src/main/java/net/minecraft/client/gui/GuiChat.java
@@ -226,15 +226,16 @@ public class GuiChat extends GuiScreen {
 			this.inputField.deleteFromCursor(i - this.inputField.getCursorPosition());
 		}
 
-		if (this.foundPlayerNames.size() > 1) {
+		int l = this.foundPlayerNames.size();
+		if (l > 1) {
 			StringBuilder stringbuilder = new StringBuilder();
 
-			for (String s2 : this.foundPlayerNames) {
+			for (int i = 0; i < l; ++i) {
 				if (stringbuilder.length() > 0) {
 					stringbuilder.append(", ");
 				}
 
-				stringbuilder.append(s2);
+				stringbuilder.append(this.foundPlayerNames.get(i));
 			}
 
 			this.mc.ingameGUI.getChatGUI()
@@ -306,7 +307,8 @@ public class GuiChat extends GuiScreen {
 			this.playerNamesFound = false;
 			this.foundPlayerNames.clear();
 
-			for (String s : parArrayOfString) {
+			for (int i = 0; i < parArrayOfString.length; ++i) {
+				String s = parArrayOfString[i];
 				if (s.length() > 0) {
 					this.foundPlayerNames.add(s);
 				}
diff --git a/src/main/java/net/minecraft/client/gui/GuiControls.java b/src/main/java/net/minecraft/client/gui/GuiControls.java
index 7eceebc..5a9cbc0 100755
--- a/src/main/java/net/minecraft/client/gui/GuiControls.java
+++ b/src/main/java/net/minecraft/client/gui/GuiControls.java
@@ -91,8 +91,9 @@ public class GuiControls extends GuiScreen {
 		if (parGuiButton.id == 200) {
 			this.mc.displayGuiScreen(this.parentScreen);
 		} else if (parGuiButton.id == 201) {
-			for (KeyBinding keybinding : this.mc.gameSettings.keyBindings) {
-				keybinding.setKeyCode(keybinding.getKeyCodeDefault());
+			KeyBinding[] arr = this.mc.gameSettings.keyBindings;
+			for (int i = 0; i < arr.length; ++i) {
+				arr[i].setKeyCode(arr[i].getKeyCodeDefault());
 			}
 
 			KeyBinding.resetKeyBindingArrayAndHash();
@@ -165,8 +166,9 @@ public class GuiControls extends GuiScreen {
 		this.drawCenteredString(this.fontRendererObj, this.screenTitle, this.width / 2, 8, 16777215);
 		boolean flag = true;
 
-		for (KeyBinding keybinding : this.options.keyBindings) {
-			if (keybinding.getKeyCode() != keybinding.getKeyCodeDefault()) {
+		KeyBinding[] arr = this.options.keyBindings;
+		for (int k = 0; k < arr.length; ++k) {
+			if (arr[k].getKeyCode() != arr[k].getKeyCodeDefault()) {
 				flag = false;
 				break;
 			}
diff --git a/src/main/java/net/minecraft/client/gui/GuiCreateFlatWorld.java b/src/main/java/net/minecraft/client/gui/GuiCreateFlatWorld.java
index f5a3d04..e523c6e 100755
--- a/src/main/java/net/minecraft/client/gui/GuiCreateFlatWorld.java
+++ b/src/main/java/net/minecraft/client/gui/GuiCreateFlatWorld.java
@@ -6,12 +6,6 @@ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.gui.Gui;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiCreateWorld;
-import net.minecraft.client.gui.GuiFlatPresets;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.GuiSlot;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
diff --git a/src/main/java/net/minecraft/client/gui/GuiCreateWorld.java b/src/main/java/net/minecraft/client/gui/GuiCreateWorld.java
index 0a4c74b..8764534 100755
--- a/src/main/java/net/minecraft/client/gui/GuiCreateWorld.java
+++ b/src/main/java/net/minecraft/client/gui/GuiCreateWorld.java
@@ -1,14 +1,8 @@
 package net.minecraft.client.gui;
 
-import java.io.IOException;
 import java.util.Random;
 
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiCreateFlatWorld;
-import net.minecraft.client.gui.GuiCustomizeWorldScreen;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.util.ChatAllowedCharacters;
 import net.minecraft.world.WorldSettings;
@@ -130,8 +124,8 @@ public class GuiCreateWorld extends GuiScreen {
 	private void func_146314_g() {
 		this.field_146336_i = this.field_146333_g.getText().trim();
 
-		for (char c0 : ChatAllowedCharacters.allowedCharactersArray) {
-			this.field_146336_i = this.field_146336_i.replace(c0, '_');
+		for (int i = 0; i < ChatAllowedCharacters.allowedCharactersArray.length; ++i) {
+			this.field_146336_i = this.field_146336_i.replace(ChatAllowedCharacters.allowedCharactersArray[i], '_');
 		}
 
 		if (StringUtils.isEmpty(this.field_146336_i)) {
@@ -180,8 +174,8 @@ public class GuiCreateWorld extends GuiScreen {
 	public static String func_146317_a(ISaveFormat parISaveFormat, String parString1) {
 		parString1 = parString1.replaceAll("[\\./\"]", "_");
 
-		for (String s : disallowedFilenames) {
-			if (parString1.equalsIgnoreCase(s)) {
+		for (int i = 0; i < disallowedFilenames.length; ++i) {
+			if (parString1.equalsIgnoreCase(disallowedFilenames[i])) {
 				parString1 = "_" + parString1 + "_";
 			}
 		}
diff --git a/src/main/java/net/minecraft/client/gui/GuiCustomizeSkin.java b/src/main/java/net/minecraft/client/gui/GuiCustomizeSkin.java
index 64679e3..50aafdc 100755
--- a/src/main/java/net/minecraft/client/gui/GuiCustomizeSkin.java
+++ b/src/main/java/net/minecraft/client/gui/GuiCustomizeSkin.java
@@ -40,7 +40,9 @@ public class GuiCustomizeSkin extends GuiScreen {
 		int i = 0;
 		this.title = I18n.format("options.skinCustomisation.title", new Object[0]);
 
-		for (EnumPlayerModelParts enumplayermodelparts : EnumPlayerModelParts.values()) {
+		EnumPlayerModelParts[] parts = EnumPlayerModelParts._VALUES;
+		for (int k = 0; k < parts.length; ++k) {
+			EnumPlayerModelParts enumplayermodelparts = parts[k];
 			this.buttonList.add(new GuiCustomizeSkin.ButtonPart(enumplayermodelparts.getPartId(),
 					this.width / 2 - 155 + i % 2 * 160, this.height / 6 + 24 * (i >> 1), 150, 20,
 					enumplayermodelparts));
diff --git a/src/main/java/net/minecraft/client/gui/GuiCustomizeWorldScreen.java b/src/main/java/net/minecraft/client/gui/GuiCustomizeWorldScreen.java
index 115bfaf..1247311 100755
--- a/src/main/java/net/minecraft/client/gui/GuiCustomizeWorldScreen.java
+++ b/src/main/java/net/minecraft/client/gui/GuiCustomizeWorldScreen.java
@@ -8,15 +8,6 @@ import java.util.Random;
 import net.lax1dude.eaglercraft.v1_8.HString;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-import net.minecraft.client.gui.Gui;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiCreateWorld;
-import net.minecraft.client.gui.GuiListButton;
-import net.minecraft.client.gui.GuiPageButtonList;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.GuiScreenCustomizePresets;
-import net.minecraft.client.gui.GuiSlider;
-import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.client.resources.I18n;
diff --git a/src/main/java/net/minecraft/client/gui/GuiDisconnected.java b/src/main/java/net/minecraft/client/gui/GuiDisconnected.java
index b276331..b37fa25 100755
--- a/src/main/java/net/minecraft/client/gui/GuiDisconnected.java
+++ b/src/main/java/net/minecraft/client/gui/GuiDisconnected.java
@@ -87,8 +87,9 @@ public class GuiDisconnected extends GuiScreen {
 				this.height / 2 - this.field_175353_i / 2 - this.fontRendererObj.FONT_HEIGHT * 2, 11184810);
 		int k = this.height / 2 - this.field_175353_i / 2;
 		if (this.multilineMessage != null) {
-			for (String s : this.multilineMessage) {
-				this.drawCenteredString(this.fontRendererObj, s, this.width / 2, k, 16777215);
+			for (int l = 0, m = this.multilineMessage.size(); l < m; ++l) {
+				this.drawCenteredString(this.fontRendererObj, this.multilineMessage.get(l), this.width / 2, k,
+						16777215);
 				k += this.fontRendererObj.FONT_HEIGHT;
 			}
 		}
diff --git a/src/main/java/net/minecraft/client/gui/GuiFlatPresets.java b/src/main/java/net/minecraft/client/gui/GuiFlatPresets.java
index 1b403c2..7105292 100755
--- a/src/main/java/net/minecraft/client/gui/GuiFlatPresets.java
+++ b/src/main/java/net/minecraft/client/gui/GuiFlatPresets.java
@@ -10,12 +10,6 @@ import net.lax1dude.eaglercraft.v1_8.Keyboard;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 import net.minecraft.block.BlockTallGrass;
-import net.minecraft.client.gui.Gui;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiCreateFlatWorld;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.GuiSlot;
-import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
@@ -189,8 +183,8 @@ public class GuiFlatPresets extends GuiScreen {
 		flatgeneratorinfo.setBiome(parBiomeGenBase.biomeID);
 		flatgeneratorinfo.func_82645_d();
 		if (parList != null) {
-			for (String s : parList) {
-				flatgeneratorinfo.getWorldFeatures().put(s, Maps.newHashMap());
+			for (int i = 0, l = parList.size(); i < l; ++i) {
+				flatgeneratorinfo.getWorldFeatures().put(parList.get(i), Maps.newHashMap());
 			}
 		}
 
diff --git a/src/main/java/net/minecraft/client/gui/GuiGameOver.java b/src/main/java/net/minecraft/client/gui/GuiGameOver.java
index dee8bce..73577b5 100755
--- a/src/main/java/net/minecraft/client/gui/GuiGameOver.java
+++ b/src/main/java/net/minecraft/client/gui/GuiGameOver.java
@@ -54,8 +54,8 @@ public class GuiGameOver extends GuiScreen implements GuiYesNoCallback {
 			}
 		}
 
-		for (GuiButton guibutton : this.buttonList) {
-			guibutton.enabled = false;
+		for (int i = 0, l = this.buttonList.size(); i < l; ++i) {
+			this.buttonList.get(i).enabled = false;
 		}
 
 	}
@@ -150,8 +150,8 @@ public class GuiGameOver extends GuiScreen implements GuiYesNoCallback {
 		super.updateScreen();
 		++this.enableButtonsTimer;
 		if (this.enableButtonsTimer == 20) {
-			for (GuiButton guibutton : this.buttonList) {
-				guibutton.enabled = true;
+			for (int i = 0, l = this.buttonList.size(); i < l; ++i) {
+				this.buttonList.get(i).enabled = true;
 			}
 		}
 
diff --git a/src/main/java/net/minecraft/client/gui/GuiIngame.java b/src/main/java/net/minecraft/client/gui/GuiIngame.java
index 02eb5b7..10363f2 100755
--- a/src/main/java/net/minecraft/client/gui/GuiIngame.java
+++ b/src/main/java/net/minecraft/client/gui/GuiIngame.java
@@ -4,7 +4,6 @@ import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
 
@@ -487,7 +486,8 @@ public class GuiIngame extends Gui {
 
 		int i = this.getFontRenderer().getStringWidth(parScoreObjective.getDisplayName());
 
-		for (Score score : (List<Score>) arraylist1) {
+		for (int m = 0, n = arraylist1.size(); m < n; ++m) {
+			Score score = (Score) arraylist1.get(m);
 			ScorePlayerTeam scoreplayerteam = scoreboard.getPlayersTeam(score.getPlayerName());
 			String s = ScorePlayerTeam.formatPlayerName(scoreplayerteam, score.getPlayerName()) + ": "
 					+ EnumChatFormatting.RED + score.getScorePoints();
@@ -500,7 +500,8 @@ public class GuiIngame extends Gui {
 		int k1 = parScaledResolution.getScaledWidth() - i - b0;
 		int j = 0;
 
-		for (Score score1 : (List<Score>) arraylist1) {
+		for (int m = 0, n = arraylist1.size(); m < n; ++m) {
+			Score score1 = (Score) arraylist1.get(m);
 			++j;
 			ScorePlayerTeam scoreplayerteam1 = scoreboard.getPlayersTeam(score1.getPlayerName());
 			String s1 = ScorePlayerTeam.formatPlayerName(scoreplayerteam1, score1.getPlayerName());
diff --git a/src/main/java/net/minecraft/client/gui/GuiKeyBindingList.java b/src/main/java/net/minecraft/client/gui/GuiKeyBindingList.java
index 1c42baf..32fe6ea 100755
--- a/src/main/java/net/minecraft/client/gui/GuiKeyBindingList.java
+++ b/src/main/java/net/minecraft/client/gui/GuiKeyBindingList.java
@@ -45,7 +45,8 @@ public class GuiKeyBindingList extends GuiListExtended {
 		int i = 0;
 		String s = null;
 
-		for (KeyBinding keybinding : akeybinding) {
+		for (int l = 0; l < akeybinding.length; ++l) {
+			KeyBinding keybinding = akeybinding[l];
 			String s1 = keybinding.getKeyCategory();
 			if (!s1.equals(s)) {
 				s = s1;
@@ -138,7 +139,9 @@ public class GuiKeyBindingList extends GuiListExtended {
 			this.btnChangeKeyBinding.displayString = GameSettings.getKeyDisplayString(this.keybinding.getKeyCode());
 			boolean flag1 = false;
 			if (this.keybinding.getKeyCode() != 0) {
-				for (KeyBinding keybindingx : GuiKeyBindingList.this.mc.gameSettings.keyBindings) {
+				KeyBinding[] kb = GuiKeyBindingList.this.mc.gameSettings.keyBindings;
+				for (int m = 0; m < kb.length; ++m) {
+					KeyBinding keybindingx = kb[m];
 					if (keybindingx != this.keybinding && keybindingx.getKeyCode() == this.keybinding.getKeyCode()) {
 						flag1 = true;
 						break;
diff --git a/src/main/java/net/minecraft/client/gui/GuiMainMenu.java b/src/main/java/net/minecraft/client/gui/GuiMainMenu.java
index ce642f1..56aaf43 100755
--- a/src/main/java/net/minecraft/client/gui/GuiMainMenu.java
+++ b/src/main/java/net/minecraft/client/gui/GuiMainMenu.java
@@ -44,7 +44,6 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.demo.DemoWorldServer;
 import net.minecraft.world.storage.ISaveFormat;
 
 /**+
@@ -358,7 +357,7 @@ public class GuiMainMenu extends GuiScreen implements GuiYesNoCallback {
 			ISaveFormat isaveformat = this.mc.getSaveLoader();
 			isaveformat.deleteWorldDirectory("Demo World");
 			this.mc.displayGuiScreen(new GuiScreenIntegratedServerBusy(this, "singleplayer.busy.deleting",
-					"singleplayer.failed.deleting", () -> SingleplayerServerController.isReady()));
+					"singleplayer.failed.deleting", SingleplayerServerController::isReady));
 		} else {
 			this.mc.displayGuiScreen(this);
 		}
diff --git a/src/main/java/net/minecraft/client/gui/GuiMultiplayer.java b/src/main/java/net/minecraft/client/gui/GuiMultiplayer.java
index 20b7da5..ab08686 100755
--- a/src/main/java/net/minecraft/client/gui/GuiMultiplayer.java
+++ b/src/main/java/net/minecraft/client/gui/GuiMultiplayer.java
@@ -264,6 +264,10 @@ public class GuiMultiplayer extends GuiScreen implements GuiYesNoCallback {
 		}
 	}
 
+	public void cancelDirectConnect() {
+		this.directConnect = false;
+	}
+
 	/**+
 	 * Fired when a key is typed (except F11 which toggles full
 	 * screen). This is the equivalent of
@@ -329,11 +333,11 @@ public class GuiMultiplayer extends GuiScreen implements GuiYesNoCallback {
 		this.drawCenteredString(this.fontRendererObj, I18n.format("multiplayer.title", new Object[0]), this.width / 2,
 				20, 16777215);
 		super.drawScreen(i, j, f);
+		relaysButton.drawScreen(i, j);
+		drawPluginDownloadLink(i, j);
 		if (this.hoveringText != null) {
 			this.drawHoveringText(Lists.newArrayList(Splitter.on("\n").split(this.hoveringText)), i, j);
 		}
-		relaysButton.drawScreen(i, j);
-		drawPluginDownloadLink(i, j);
 	}
 
 	private void drawPluginDownloadLink(int xx, int yy) {
diff --git a/src/main/java/net/minecraft/client/gui/GuiNewChat.java b/src/main/java/net/minecraft/client/gui/GuiNewChat.java
index d6c92a6..422631f 100755
--- a/src/main/java/net/minecraft/client/gui/GuiNewChat.java
+++ b/src/main/java/net/minecraft/client/gui/GuiNewChat.java
@@ -154,13 +154,13 @@ public class GuiNewChat extends Gui {
 		List list = GuiUtilRenderComponents.func_178908_a(parIChatComponent, i, this.mc.fontRendererObj, false, false);
 		boolean flag = this.getChatOpen();
 
-		for (IChatComponent ichatcomponent : (List<IChatComponent>) list) {
+		for (int j = 0, l = list.size(); j < l; ++j) {
 			if (flag && this.scrollPos > 0) {
 				this.isScrolled = true;
 				this.scroll(1);
 			}
 
-			this.field_146253_i.add(0, new ChatLine(parInt2, ichatcomponent, parInt1));
+			this.field_146253_i.add(0, new ChatLine(parInt2, (IChatComponent) list.get(j), parInt1));
 		}
 
 		while (this.field_146253_i.size() > 100) {
diff --git a/src/main/java/net/minecraft/client/gui/GuiOptions.java b/src/main/java/net/minecraft/client/gui/GuiOptions.java
index bbef4a1..6745e57 100755
--- a/src/main/java/net/minecraft/client/gui/GuiOptions.java
+++ b/src/main/java/net/minecraft/client/gui/GuiOptions.java
@@ -1,16 +1,23 @@
 package net.minecraft.client.gui;
 
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.Mouse;
+import net.lax1dude.eaglercraft.v1_8.internal.EnumCursorType;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumPlatformType;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerFolderResourcePack;
+import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.EaglerDeferredPipeline;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.gui.GuiShaderConfig;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.gui.GuiShadersNotSupported;
+import net.lax1dude.eaglercraft.v1_8.profile.GuiScreenImportExportProfile;
 import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController;
-import net.lax1dude.eaglercraft.v1_8.vfs.SYS;
+import net.minecraft.client.audio.PositionedSoundRecord;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.client.settings.GameSettings;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.EnumDifficulty;
 
 /**+
@@ -57,7 +64,8 @@ public class GuiOptions extends GuiScreen implements GuiYesNoCallback {
 		int i = 0;
 		this.field_146442_a = I18n.format("options.title", new Object[0]);
 
-		for (GameSettings.Options gamesettings$options : field_146440_f) {
+		for (int j = 0; j < field_146440_f.length; ++j) {
+			GameSettings.Options gamesettings$options = field_146440_f[j];
 			if (gamesettings$options.getEnumFloat()) {
 				this.buttonList.add(new GuiOptionSlider(gamesettings$options.returnEnumOrdinal(),
 						this.width / 2 - 155 + i % 2 * 160, this.height / 6 - 12 + 24 * (i >> 1),
@@ -108,17 +116,15 @@ public class GuiOptions extends GuiScreen implements GuiYesNoCallback {
 				I18n.format("options.language", new Object[0])));
 		this.buttonList.add(new GuiButton(103, this.width / 2 + 5, this.height / 6 + 120 - 6, 150, 20,
 				I18n.format("options.chat.title", new Object[0])));
-		GuiButton rp;
-		this.buttonList.add(rp = new GuiButton(105, this.width / 2 - 155, this.height / 6 + 144 - 6, 150, 20,
+		GuiButton btn;
+		this.buttonList.add(btn = new GuiButton(105, this.width / 2 - 155, this.height / 6 + 144 - 6, 150, 20,
 				I18n.format("options.resourcepack", new Object[0])));
-		GuiButton dbg;
-		this.buttonList.add(dbg = new GuiButton(104, this.width / 2 + 5, this.height / 6 + 144 - 6, 150, 20,
+		btn.enabled = EaglerFolderResourcePack.isSupported();
+		this.buttonList.add(btn = new GuiButton(104, this.width / 2 + 5, this.height / 6 + 144 - 6, 150, 20,
 				I18n.format("options.debugConsoleButton", new Object[0])));
-		dbg.enabled = EagRuntime.getPlatformType() != EnumPlatformType.DESKTOP;
+		btn.enabled = EagRuntime.getPlatformType() != EnumPlatformType.DESKTOP;
 		this.buttonList.add(new GuiButton(200, this.width / 2 - 100, this.height / 6 + 168,
 				I18n.format("gui.done", new Object[0])));
-
-		rp.enabled = SYS.VFS != null;
 	}
 
 	public String func_175355_a(EnumDifficulty parEnumDifficulty) {
@@ -241,6 +247,36 @@ public class GuiOptions extends GuiScreen implements GuiYesNoCallback {
 	public void drawScreen(int i, int j, float f) {
 		this.drawDefaultBackground();
 		this.drawCenteredString(this.fontRendererObj, this.field_146442_a, this.width / 2, 15, 16777215);
+
+		if (mc.theWorld == null && !EagRuntime.getConfiguration().isDemo()) {
+			GlStateManager.pushMatrix();
+			GlStateManager.scale(0.75f, 0.75f, 0.75f);
+			GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
+			String text = I18n.format("editProfile.importExport");
+
+			int w = mc.fontRendererObj.getStringWidth(text);
+			boolean hover = i > 1 && j > 1 && i < (w * 3 / 4) + 7 && j < 12;
+			if (hover) {
+				Mouse.showCursor(EnumCursorType.HAND);
+			}
+
+			drawString(mc.fontRendererObj, EnumChatFormatting.UNDERLINE + text, 5, 5, hover ? 0xFFEEEE22 : 0xFFCCCCCC);
+
+			GlStateManager.popMatrix();
+		}
+
 		super.drawScreen(i, j, f);
 	}
+
+	protected void mouseClicked(int mx, int my, int button) {
+		super.mouseClicked(mx, my, button);
+		if (mc.theWorld == null && !EagRuntime.getConfiguration().isDemo()) {
+			int w = mc.fontRendererObj.getStringWidth(I18n.format("editProfile.importExport"));
+			if (mx > 1 && my > 1 && mx < (w * 3 / 4) + 7 && my < 12) {
+				mc.displayGuiScreen(new GuiScreenImportExportProfile(this));
+				mc.getSoundHandler()
+						.playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F));
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/gui/GuiOverlayDebug.java b/src/main/java/net/minecraft/client/gui/GuiOverlayDebug.java
index eeec6fd..ced0111 100755
--- a/src/main/java/net/minecraft/client/gui/GuiOverlayDebug.java
+++ b/src/main/java/net/minecraft/client/gui/GuiOverlayDebug.java
@@ -20,18 +20,14 @@ import net.lax1dude.eaglercraft.v1_8.HString;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumPlatformType;
 import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
 import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController;
 import net.minecraft.block.Block;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.ClientBrandRetriever;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumChatFormatting;
@@ -284,7 +280,8 @@ public class GuiOverlayDebug extends Gui {
 				List<String> strs = SingleplayerServerController.getTPS();
 				int l;
 				boolean first = true;
-				for (String str : strs) {
+				for (int j = 0, m = strs.size(); j < m; ++j) {
+					String str = strs.get(j);
 					l = (int) (this.fontRenderer.getStringWidth(str) * (!first ? 0.5f : 1.0f));
 					GlStateManager.pushMatrix();
 					GlStateManager.translate(parScaledResolution.getScaledWidth() - 2 - l, i + 2, 0.0f);
diff --git a/src/main/java/net/minecraft/client/gui/GuiPageButtonList.java b/src/main/java/net/minecraft/client/gui/GuiPageButtonList.java
index eaaea33..79b4db2 100755
--- a/src/main/java/net/minecraft/client/gui/GuiPageButtonList.java
+++ b/src/main/java/net/minecraft/client/gui/GuiPageButtonList.java
@@ -50,7 +50,8 @@ public class GuiPageButtonList extends GuiListExtended {
 	}
 
 	private void func_178069_s() {
-		for (GuiPageButtonList.GuiListEntry[] aguipagebuttonlist$guilistentry : this.field_178078_x) {
+		for (int n = 0; n < this.field_178078_x.length; ++n) {
+			GuiPageButtonList.GuiListEntry[] aguipagebuttonlist$guilistentry = this.field_178078_x[n];
 			for (int i = 0; i < aguipagebuttonlist$guilistentry.length; i += 2) {
 				GuiPageButtonList.GuiListEntry guipagebuttonlist$guilistentry = aguipagebuttonlist$guilistentry[i];
 				GuiPageButtonList.GuiListEntry guipagebuttonlist$guilistentry1 = i < aguipagebuttonlist$guilistentry.length
@@ -137,17 +138,18 @@ public class GuiPageButtonList extends GuiListExtended {
 	}
 
 	private void func_178060_e(int parInt1, int parInt2) {
-		for (GuiPageButtonList.GuiListEntry guipagebuttonlist$guilistentry : this.field_178078_x[parInt1]) {
-			if (guipagebuttonlist$guilistentry != null) {
-				this.func_178066_a((Gui) this.field_178073_v.lookup(guipagebuttonlist$guilistentry.func_178935_b()),
-						false);
+
+		GuiListEntry[] etr = this.field_178078_x[parInt1];
+		for (int i = 0; i < etr.length; ++i) {
+			if (etr[i] != null) {
+				this.func_178066_a((Gui) this.field_178073_v.lookup(etr[i].func_178935_b()), false);
 			}
 		}
 
-		for (GuiPageButtonList.GuiListEntry guipagebuttonlist$guilistentry1 : this.field_178078_x[parInt2]) {
-			if (guipagebuttonlist$guilistentry1 != null) {
-				this.func_178066_a((Gui) this.field_178073_v.lookup(guipagebuttonlist$guilistentry1.func_178935_b()),
-						true);
+		etr = this.field_178078_x[parInt2];
+		for (int i = 0; i < etr.length; ++i) {
+			if (etr[i] != null) {
+				this.func_178066_a((Gui) this.field_178073_v.lookup(etr[i].func_178935_b()), true);
 			}
 		}
 
@@ -181,7 +183,8 @@ public class GuiPageButtonList extends GuiListExtended {
 	}
 
 	public void func_181155_a(boolean parFlag) {
-		for (GuiPageButtonList.GuiEntry guipagebuttonlist$guientry : this.field_178074_u) {
+		for (int i = 0, l = this.field_178074_u.size(); i < l; ++i) {
+			GuiPageButtonList.GuiEntry guipagebuttonlist$guientry = this.field_178074_u.get(i);
 			if (guipagebuttonlist$guientry.field_178029_b instanceof GuiButton) {
 				((GuiButton) guipagebuttonlist$guientry.field_178029_b).enabled = parFlag;
 			}
@@ -290,8 +293,8 @@ public class GuiPageButtonList extends GuiListExtended {
 				int i = this.field_178072_w.indexOf(this.field_178075_A);
 				int j = i;
 
-				for (String s1 : astring) {
-					((GuiTextField) this.field_178072_w.get(j)).setText(s1);
+				for (int k = 0; k < astring.length; ++k) {
+					((GuiTextField) this.field_178072_w.get(j)).setText(astring[k]);
 					if (j == this.field_178072_w.size() - 1) {
 						j = 0;
 					} else {
diff --git a/src/main/java/net/minecraft/client/gui/GuiPlayerTabOverlay.java b/src/main/java/net/minecraft/client/gui/GuiPlayerTabOverlay.java
index dea4e5f..3f664d9 100755
--- a/src/main/java/net/minecraft/client/gui/GuiPlayerTabOverlay.java
+++ b/src/main/java/net/minecraft/client/gui/GuiPlayerTabOverlay.java
@@ -90,7 +90,8 @@ public class GuiPlayerTabOverlay extends Gui {
 		int i = 0;
 		int j = 0;
 
-		for (NetworkPlayerInfo networkplayerinfo : (List<NetworkPlayerInfo>) list) {
+		for (int m = 0, n = list.size(); m < n; ++m) {
+			NetworkPlayerInfo networkplayerinfo = (NetworkPlayerInfo) list.get(m);
 			int k = this.mc.fontRendererObj.getStringWidth(this.getPlayerName(networkplayerinfo));
 			i = Math.max(i, k);
 			if (scoreObjectiveIn != null
@@ -127,21 +128,21 @@ public class GuiPlayerTabOverlay extends Gui {
 		int j1 = width / 2 - (i1 * j4 + (j4 - 1) * 5) / 2;
 		int k1 = 10;
 		int l1 = i1 * j4 + (j4 - 1) * 5;
-		List list1 = null;
-		List list2 = null;
+		List<String> list1 = null;
+		List<String> list2 = null;
 		if (this.header != null) {
 			list1 = this.mc.fontRendererObj.listFormattedStringToWidth(this.header.getFormattedText(), width - 50);
 
-			for (String s : (List<String>) list1) {
-				l1 = Math.max(l1, this.mc.fontRendererObj.getStringWidth(s));
+			for (int m = 0, n = list1.size(); m < n; ++m) {
+				l1 = Math.max(l1, this.mc.fontRendererObj.getStringWidth(list1.get(m)));
 			}
 		}
 
 		if (this.footer != null) {
 			list2 = this.mc.fontRendererObj.listFormattedStringToWidth(this.footer.getFormattedText(), width - 50);
 
-			for (String s2 : (List<String>) list2) {
-				l1 = Math.max(l1, this.mc.fontRendererObj.getStringWidth(s2));
+			for (int m = 0, n = list2.size(); m < n; ++m) {
+				l1 = Math.max(l1, this.mc.fontRendererObj.getStringWidth(list2.get(m)));
 			}
 		}
 
@@ -149,7 +150,8 @@ public class GuiPlayerTabOverlay extends Gui {
 			drawRect(width / 2 - l1 / 2 - 1, k1 - 1, width / 2 + l1 / 2 + 1,
 					k1 + list1.size() * this.mc.fontRendererObj.FONT_HEIGHT, Integer.MIN_VALUE);
 
-			for (String s3 : (List<String>) list1) {
+			for (int m = 0, n = list1.size(); m < n; ++m) {
+				String s3 = list1.get(m);
 				int i2 = this.mc.fontRendererObj.getStringWidth(s3);
 				this.mc.fontRendererObj.drawStringWithShadow(s3, (float) (width / 2 - i2 / 2), (float) k1, -1);
 				k1 += this.mc.fontRendererObj.FONT_HEIGHT;
@@ -216,7 +218,8 @@ public class GuiPlayerTabOverlay extends Gui {
 			drawRect(width / 2 - l1 / 2 - 1, k1 - 1, width / 2 + l1 / 2 + 1,
 					k1 + list2.size() * this.mc.fontRendererObj.FONT_HEIGHT, Integer.MIN_VALUE);
 
-			for (String s4 : (List<String>) list2) {
+			for (int m = 0, n = list2.size(); m < n; ++m) {
+				String s4 = list2.get(m);
 				int j5 = this.mc.fontRendererObj.getStringWidth(s4);
 				this.mc.fontRendererObj.drawStringWithShadow(s4, (float) (width / 2 - j5 / 2), (float) k1, -1);
 				k1 += this.mc.fontRendererObj.FONT_HEIGHT;
diff --git a/src/main/java/net/minecraft/client/gui/GuiRenameWorld.java b/src/main/java/net/minecraft/client/gui/GuiRenameWorld.java
index f7ecdab..bdd4a54 100755
--- a/src/main/java/net/minecraft/client/gui/GuiRenameWorld.java
+++ b/src/main/java/net/minecraft/client/gui/GuiRenameWorld.java
@@ -1,13 +1,8 @@
 package net.minecraft.client.gui;
 
-import java.io.IOException;
-
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
 import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController;
 import net.lax1dude.eaglercraft.v1_8.sp.gui.GuiScreenIntegratedServerBusy;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.world.storage.ISaveFormat;
 import net.minecraft.world.storage.WorldInfo;
@@ -101,13 +96,13 @@ public class GuiRenameWorld extends GuiScreen {
 					SingleplayerServerController.duplicateWorld(this.saveName, this.field_146583_f.getText().trim());
 					this.mc.displayGuiScreen(
 							new GuiScreenIntegratedServerBusy(this.parentScreen, "singleplayer.busy.duplicating",
-									"singleplayer.failed.duplicating", () -> SingleplayerServerController.isReady()));
+									"singleplayer.failed.duplicating", SingleplayerServerController::isReady));
 				} else {
 					ISaveFormat isaveformat = this.mc.getSaveLoader();
 					isaveformat.renameWorld(this.saveName, this.field_146583_f.getText().trim());
 					this.mc.displayGuiScreen(
 							new GuiScreenIntegratedServerBusy(this.parentScreen, "singleplayer.busy.renaming",
-									"singleplayer.failed.renaming", () -> SingleplayerServerController.isReady()));
+									"singleplayer.failed.renaming", SingleplayerServerController::isReady));
 				}
 			}
 		}
diff --git a/src/main/java/net/minecraft/client/gui/GuiScreen.java b/src/main/java/net/minecraft/client/gui/GuiScreen.java
index a15e090..837f008 100755
--- a/src/main/java/net/minecraft/client/gui/GuiScreen.java
+++ b/src/main/java/net/minecraft/client/gui/GuiScreen.java
@@ -92,11 +92,11 @@ public abstract class GuiScreen extends Gui implements GuiYesNoCallback {
 	 * mouseY, renderPartialTicks
 	 */
 	public void drawScreen(int i, int j, float var3) {
-		for (int k = 0; k < this.buttonList.size(); ++k) {
+		for (int k = 0, l = this.buttonList.size(); k < l; ++k) {
 			((GuiButton) this.buttonList.get(k)).drawButton(this.mc, i, j);
 		}
 
-		for (int l = 0; l < this.labelList.size(); ++l) {
+		for (int l = 0, m = this.labelList.size(); l < m; ++l) {
 			((GuiLabel) this.labelList.get(l)).drawLabel(this.mc, i, j);
 		}
 
@@ -178,7 +178,7 @@ public abstract class GuiScreen extends Gui implements GuiYesNoCallback {
 	protected void renderToolTip(ItemStack itemstack, int i, int j) {
 		List list = itemstack.getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips);
 
-		for (int k = 0; k < list.size(); ++k) {
+		for (int k = 0, l = list.size(); k < l; ++k) {
 			if (k == 0) {
 				list.set(k, itemstack.getRarity().rarityColor + (String) list.get(k));
 			} else {
@@ -210,8 +210,8 @@ public abstract class GuiScreen extends Gui implements GuiYesNoCallback {
 			GlStateManager.disableDepth();
 			int k = 0;
 
-			for (String s : list) {
-				int l = this.fontRendererObj.getStringWidth(s);
+			for (int m = 0, n = list.size(); m < n; ++m) {
+				int l = this.fontRendererObj.getStringWidth(list.get(m));
 				if (l > k) {
 					k = l;
 				}
diff --git a/src/main/java/net/minecraft/client/gui/GuiScreenAddServer.java b/src/main/java/net/minecraft/client/gui/GuiScreenAddServer.java
index 096a9c9..157a8c4 100755
--- a/src/main/java/net/minecraft/client/gui/GuiScreenAddServer.java
+++ b/src/main/java/net/minecraft/client/gui/GuiScreenAddServer.java
@@ -102,8 +102,8 @@ public class GuiScreenAddServer extends GuiScreen {
 						+ I18n.format(this.serverData.hideAddress ? "gui.yes" : "gui.no", new Object[0]);
 			} else if (parGuiButton.id == 2) {
 				this.serverData.setResourceMode(
-						ServerData.ServerResourceMode.values()[(this.serverData.getResourceMode().ordinal() + 1)
-								% ServerData.ServerResourceMode.values().length]);
+						ServerData.ServerResourceMode._VALUES[(this.serverData.getResourceMode().ordinal() + 1)
+								% ServerData.ServerResourceMode._VALUES.length]);
 				this.serverResourcePacks.displayString = I18n.format("addServer.resourcePack", new Object[0]) + ": "
 						+ this.serverData.getResourceMode().getMotd().getFormattedText();
 			} else if (parGuiButton.id == 1) {
diff --git a/src/main/java/net/minecraft/client/gui/GuiScreenCustomizePresets.java b/src/main/java/net/minecraft/client/gui/GuiScreenCustomizePresets.java
index 755cff7..5f37217 100755
--- a/src/main/java/net/minecraft/client/gui/GuiScreenCustomizePresets.java
+++ b/src/main/java/net/minecraft/client/gui/GuiScreenCustomizePresets.java
@@ -7,11 +7,6 @@ import java.util.List;
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiCustomizeWorldScreen;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.GuiSlot;
-import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.client.resources.I18n;
diff --git a/src/main/java/net/minecraft/client/gui/GuiScreenOptionsSounds.java b/src/main/java/net/minecraft/client/gui/GuiScreenOptionsSounds.java
index c6cb9b1..f26f037 100755
--- a/src/main/java/net/minecraft/client/gui/GuiScreenOptionsSounds.java
+++ b/src/main/java/net/minecraft/client/gui/GuiScreenOptionsSounds.java
@@ -54,7 +54,9 @@ public class GuiScreenOptionsSounds extends GuiScreen {
 				this.width / 2 - 155 + i % 2 * 160, this.height / 6 - 12 + 24 * (i >> 1), SoundCategory.MASTER, true));
 		i = i + 2;
 
-		for (SoundCategory soundcategory : SoundCategory.values()) {
+		SoundCategory[] cats = SoundCategory._VALUES;
+		for (int j = 0; j < cats.length; ++j) {
+			SoundCategory soundcategory = cats[j];
 			if (soundcategory != SoundCategory.MASTER) {
 				this.buttonList.add(new GuiScreenOptionsSounds.Button(soundcategory.getCategoryId(),
 						this.width / 2 - 155 + i % 2 * 160, this.height / 6 - 12 + 24 * (i >> 1), soundcategory,
diff --git a/src/main/java/net/minecraft/client/gui/GuiScreenResourcePacks.java b/src/main/java/net/minecraft/client/gui/GuiScreenResourcePacks.java
index f1c13ae..185ca19 100755
--- a/src/main/java/net/minecraft/client/gui/GuiScreenResourcePacks.java
+++ b/src/main/java/net/minecraft/client/gui/GuiScreenResourcePacks.java
@@ -1,6 +1,5 @@
 package net.minecraft.client.gui;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -9,10 +8,11 @@ import java.util.List;
 import com.google.common.collect.Lists;
 
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
-import net.lax1dude.eaglercraft.v1_8.vfs.SYS;
 import net.lax1dude.eaglercraft.v1_8.internal.FileChooserResult;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerFolderResourcePack;
+import net.lax1dude.eaglercraft.v1_8.minecraft.GuiScreenGenericErrorMessage;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.client.resources.ResourcePackListEntry;
 import net.minecraft.client.resources.ResourcePackListEntryDefault;
@@ -58,10 +58,8 @@ public class GuiScreenResourcePacks extends GuiScreen {
 	 * window resizes, the buttonList is cleared beforehand.
 	 */
 	public void initGui() {
-		GuiButton btn;
-		this.buttonList.add(btn = new GuiOptionButton(2, this.width / 2 - 154, this.height - 48,
+		this.buttonList.add(new GuiOptionButton(2, this.width / 2 - 154, this.height - 48,
 				I18n.format("resourcePack.openFolder", new Object[0])));
-		btn.enabled = SYS.VFS != null;
 		this.buttonList.add(
 				new GuiOptionButton(1, this.width / 2 + 4, this.height - 48, I18n.format("gui.done", new Object[0])));
 		if (!this.changed) {
@@ -69,16 +67,18 @@ public class GuiScreenResourcePacks extends GuiScreen {
 			this.selectedResourcePacks = Lists.newArrayList();
 			ResourcePackRepository resourcepackrepository = this.mc.getResourcePackRepository();
 			resourcepackrepository.updateRepositoryEntriesAll();
-			ArrayList arraylist = Lists.newArrayList(resourcepackrepository.getRepositoryEntriesAll());
+			List arraylist = Lists.newArrayList(resourcepackrepository.getRepositoryEntriesAll());
 			arraylist.removeAll(resourcepackrepository.getRepositoryEntries());
 
-			for (ResourcePackRepository.Entry resourcepackrepository$entry : (List<ResourcePackRepository.Entry>) arraylist) {
-				this.availableResourcePacks.add(new ResourcePackListEntryFound(this, resourcepackrepository$entry));
+			for (int i = 0, l = arraylist.size(); i < l; ++i) {
+				this.availableResourcePacks
+						.add(new ResourcePackListEntryFound(this, (ResourcePackRepository.Entry) arraylist.get(i)));
 			}
 
-			for (ResourcePackRepository.Entry resourcepackrepository$entry1 : Lists
-					.reverse(resourcepackrepository.getRepositoryEntries())) {
-				this.selectedResourcePacks.add(new ResourcePackListEntryFound(this, resourcepackrepository$entry1));
+			arraylist = Lists.reverse(resourcepackrepository.getRepositoryEntries());
+			for (int i = 0, l = arraylist.size(); i < l; ++i) {
+				this.selectedResourcePacks
+						.add(new ResourcePackListEntryFound(this, (ResourcePackRepository.Entry) arraylist.get(i)));
 			}
 
 			this.selectedResourcePacks.add(new ResourcePackListEntryDefault(this));
@@ -138,14 +138,13 @@ public class GuiScreenResourcePacks extends GuiScreen {
 	protected void actionPerformed(GuiButton parGuiButton) {
 		if (parGuiButton.enabled) {
 			if (parGuiButton.id == 2) {
-				if (SYS.VFS == null)
-					return;
 				EagRuntime.displayFileChooser("application/zip", "zip");
 			} else if (parGuiButton.id == 1) {
 				if (this.changed) {
-					ArrayList arraylist = Lists.newArrayList();
+					ArrayList<ResourcePackRepository.Entry> arraylist = Lists.newArrayList();
 
-					for (ResourcePackListEntry resourcepacklistentry : this.selectedResourcePacks) {
+					for (int i = 0, l = this.selectedResourcePacks.size(); i < l; ++i) {
+						ResourcePackListEntry resourcepacklistentry = this.selectedResourcePacks.get(i);
 						if (resourcepacklistentry instanceof ResourcePackListEntryFound) {
 							arraylist.add(((ResourcePackListEntryFound) resourcepacklistentry).func_148318_i());
 						}
@@ -156,7 +155,8 @@ public class GuiScreenResourcePacks extends GuiScreen {
 					this.mc.gameSettings.resourcePacks.clear();
 					this.mc.gameSettings.field_183018_l.clear();
 
-					for (ResourcePackRepository.Entry resourcepackrepository$entry : (List<ResourcePackRepository.Entry>) arraylist) {
+					for (int i = 0, l = arraylist.size(); i < l; ++i) {
+						ResourcePackRepository.Entry resourcepackrepository$entry = arraylist.get(i);
 						this.mc.gameSettings.resourcePacks.add(resourcepackrepository$entry.getResourcePackName());
 						if (resourcepackrepository$entry.func_183027_f() != 1) {
 							this.mc.gameSettings.field_183018_l.add(resourcepackrepository$entry.getResourcePackName());
@@ -179,15 +179,25 @@ public class GuiScreenResourcePacks extends GuiScreen {
 		if (EagRuntime.fileChooserHasResult()) {
 			packFile = EagRuntime.getFileChooserResult();
 		}
-		if (packFile == null)
+		if (packFile == null) {
 			return;
-		logger.info("Loading resource pack: {}", packFile.fileName);
+		}
 		mc.loadingScreen.eaglerShow(I18n.format("resourcePack.load.loading"), packFile.fileName);
-		SYS.loadResourcePack(packFile.fileName, new ByteArrayInputStream(packFile.fileData), null);
+		try {
+			EaglerFolderResourcePack.importResourcePack(packFile.fileName, EaglerFolderResourcePack.RESOURCE_PACKS,
+					packFile.fileData);
+		} catch (IOException e) {
+			logger.error("Could not load resource pack: {}", packFile.fileName);
+			logger.error(e);
+			mc.displayGuiScreen(new GuiScreenGenericErrorMessage("resourcePack.importFailed.1",
+					"resourcePack.importFailed.2", parentScreen));
+			return;
+		}
 
-		ArrayList arraylist = Lists.newArrayList();
+		ArrayList<ResourcePackRepository.Entry> arraylist = Lists.newArrayList();
 
-		for (ResourcePackListEntry resourcepacklistentry : this.selectedResourcePacks) {
+		for (int i = 0, l = this.selectedResourcePacks.size(); i < l; ++i) {
+			ResourcePackListEntry resourcepacklistentry = this.selectedResourcePacks.get(i);
 			if (resourcepacklistentry instanceof ResourcePackListEntryFound) {
 				arraylist.add(((ResourcePackListEntryFound) resourcepacklistentry).func_148318_i());
 			}
@@ -198,7 +208,8 @@ public class GuiScreenResourcePacks extends GuiScreen {
 		this.mc.gameSettings.resourcePacks.clear();
 		this.mc.gameSettings.field_183018_l.clear();
 
-		for (ResourcePackRepository.Entry resourcepackrepository$entry : (List<ResourcePackRepository.Entry>) arraylist) {
+		for (int i = 0, l = arraylist.size(); i < l; ++i) {
+			ResourcePackRepository.Entry resourcepackrepository$entry = arraylist.get(i);
 			this.mc.gameSettings.resourcePacks.add(resourcepackrepository$entry.getResourcePackName());
 			if (resourcepackrepository$entry.func_183027_f() != 1) {
 				this.mc.gameSettings.field_183018_l.add(resourcepackrepository$entry.getResourcePackName());
diff --git a/src/main/java/net/minecraft/client/gui/GuiSelectWorld.java b/src/main/java/net/minecraft/client/gui/GuiSelectWorld.java
index f609a3c..61743f8 100755
--- a/src/main/java/net/minecraft/client/gui/GuiSelectWorld.java
+++ b/src/main/java/net/minecraft/client/gui/GuiSelectWorld.java
@@ -13,14 +13,6 @@ import net.lax1dude.eaglercraft.v1_8.sp.gui.GuiScreenLANNotSupported;
 import net.lax1dude.eaglercraft.v1_8.sp.lan.LANServerController;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.PositionedSoundRecord;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiCreateWorld;
-import net.minecraft.client.gui.GuiErrorScreen;
-import net.minecraft.client.gui.GuiRenameWorld;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.GuiSlot;
-import net.minecraft.client.gui.GuiYesNo;
-import net.minecraft.client.gui.GuiYesNoCallback;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.ResourceLocation;
@@ -110,7 +102,7 @@ public class GuiSelectWorld extends GuiScreen implements GuiYesNoCallback {
 			waitingForWorlds = true;
 			this.mc.getSaveLoader().flushCache();
 			this.mc.displayGuiScreen(new GuiScreenIntegratedServerBusy(this, "singleplayer.busy.listingworlds",
-					"singleplayer.failed.listingworlds", () -> SingleplayerServerController.isReady(), (t, u) -> {
+					"singleplayer.failed.listingworlds", SingleplayerServerController::isReady, (t, u) -> {
 						GuiScreenIntegratedServerBusy tt = (GuiScreenIntegratedServerBusy) t;
 						Minecraft.getMinecraft().displayGuiScreen(
 								GuiScreenIntegratedServerBusy.createException(parentScreen, tt.failMessage, u));
@@ -232,7 +224,7 @@ public class GuiSelectWorld extends GuiScreen implements GuiYesNoCallback {
 				ISaveFormat isaveformat = this.mc.getSaveLoader();
 				isaveformat.deleteWorldDirectory(this.func_146621_a(i));
 				this.mc.displayGuiScreen(new GuiScreenIntegratedServerBusy(this, "singleplayer.busy.deleting",
-						"singleplayer.failed.deleting", () -> SingleplayerServerController.isReady()));
+						"singleplayer.failed.deleting", SingleplayerServerController::isReady));
 			} else {
 				this.mc.displayGuiScreen(this);
 			}
diff --git a/src/main/java/net/minecraft/client/gui/GuiVideoSettings.java b/src/main/java/net/minecraft/client/gui/GuiVideoSettings.java
index 9daa4c0..98536ba 100755
--- a/src/main/java/net/minecraft/client/gui/GuiVideoSettings.java
+++ b/src/main/java/net/minecraft/client/gui/GuiVideoSettings.java
@@ -58,17 +58,8 @@ public class GuiVideoSettings extends GuiScreen {
 		this.buttonList.clear();
 		this.buttonList.add(
 				new GuiButton(200, this.width / 2 - 100, this.height - 27, I18n.format("gui.done", new Object[0])));
-		GameSettings.Options[] agamesettings$options = new GameSettings.Options[videoOptions.length];
-		int i = 0;
-
-		for (GameSettings.Options gamesettings$options : videoOptions) {
-			agamesettings$options[i] = gamesettings$options;
-			++i;
-		}
-
 		this.optionsRowList = new GuiOptionsRowList(this.mc, this.width, this.height, 32, this.height - 32, 25,
-				agamesettings$options);
-
+				videoOptions);
 	}
 
 	/**+
diff --git a/src/main/java/net/minecraft/client/gui/GuiYesNo.java b/src/main/java/net/minecraft/client/gui/GuiYesNo.java
index 8c9086d..4d061b0 100755
--- a/src/main/java/net/minecraft/client/gui/GuiYesNo.java
+++ b/src/main/java/net/minecraft/client/gui/GuiYesNo.java
@@ -90,8 +90,8 @@ public class GuiYesNo extends GuiScreen {
 		this.drawCenteredString(this.fontRendererObj, this.messageLine1, this.width / 2, 70, 16777215);
 		int k = 90;
 
-		for (String s : this.field_175298_s) {
-			this.drawCenteredString(this.fontRendererObj, s, this.width / 2, k, 16777215);
+		for (int l = 0, m = this.field_175298_s.size(); l < m; ++l) {
+			this.drawCenteredString(this.fontRendererObj, this.field_175298_s.get(l), this.width / 2, k, 16777215);
 			k += this.fontRendererObj.FONT_HEIGHT;
 		}
 
@@ -104,8 +104,8 @@ public class GuiYesNo extends GuiScreen {
 	public void setButtonDelay(int parInt1) {
 		this.ticksUntilEnable = parInt1;
 
-		for (GuiButton guibutton : this.buttonList) {
-			guibutton.enabled = false;
+		for (int l = 0, m = this.buttonList.size(); l < m; ++l) {
+			this.buttonList.get(l).enabled = false;
 		}
 
 	}
@@ -116,8 +116,8 @@ public class GuiYesNo extends GuiScreen {
 	public void updateScreen() {
 		super.updateScreen();
 		if (--this.ticksUntilEnable == 0) {
-			for (GuiButton guibutton : this.buttonList) {
-				guibutton.enabled = true;
+			for (int l = 0, m = this.buttonList.size(); l < m; ++l) {
+				this.buttonList.get(l).enabled = true;
 			}
 		}
 
diff --git a/src/main/java/net/minecraft/client/gui/ScreenChatOptions.java b/src/main/java/net/minecraft/client/gui/ScreenChatOptions.java
index 4bd8b0a..9417632 100755
--- a/src/main/java/net/minecraft/client/gui/ScreenChatOptions.java
+++ b/src/main/java/net/minecraft/client/gui/ScreenChatOptions.java
@@ -47,7 +47,8 @@ public class ScreenChatOptions extends GuiScreen {
 		int i = 0;
 		this.field_146401_i = I18n.format("options.chat.title", new Object[0]);
 
-		for (GameSettings.Options gamesettings$options : field_146399_a) {
+		for (int j = 0; j < field_146399_a.length; ++j) {
+			GameSettings.Options gamesettings$options = field_146399_a[j];
 			if (gamesettings$options.getEnumFloat()) {
 				this.buttonList.add(new GuiOptionSlider(gamesettings$options.returnEnumOrdinal(),
 						this.width / 2 - 155 + i % 2 * 160, this.height / 6 + 24 * (i >> 1), gamesettings$options));
diff --git a/src/main/java/net/minecraft/client/gui/achievement/GuiStats.java b/src/main/java/net/minecraft/client/gui/achievement/GuiStats.java
index 82a6008..e8fd2f6 100755
--- a/src/main/java/net/minecraft/client/gui/achievement/GuiStats.java
+++ b/src/main/java/net/minecraft/client/gui/achievement/GuiStats.java
@@ -421,7 +421,8 @@ public class GuiStats extends GuiScreen implements IProgressMeter {
 			super(mcIn);
 			this.statsHolder = Lists.newArrayList();
 
-			for (StatCrafting statcrafting : StatList.objectMineStats) {
+			for (int m = 0, l = StatList.objectMineStats.size(); m < l; ++m) {
+				StatCrafting statcrafting = StatList.objectMineStats.get(m);
 				boolean flag = false;
 				int i = Item.getIdFromItem(statcrafting.func_150959_a());
 				if (GuiStats.this.field_146546_t.readStat(statcrafting) > 0) {
@@ -555,7 +556,8 @@ public class GuiStats extends GuiScreen implements IProgressMeter {
 			super(mcIn);
 			this.statsHolder = Lists.newArrayList();
 
-			for (StatCrafting statcrafting : StatList.itemStats) {
+			for (int m = 0, l = StatList.itemStats.size(); m < l; ++m) {
+				StatCrafting statcrafting = StatList.itemStats.get(m);
 				boolean flag = false;
 				int i = Item.getIdFromItem(statcrafting.func_150959_a());
 				if (GuiStats.this.field_146546_t.readStat(statcrafting) > 0) {
diff --git a/src/main/java/net/minecraft/client/gui/inventory/GuiBeacon.java b/src/main/java/net/minecraft/client/gui/inventory/GuiBeacon.java
index 90e2ee8..309a313 100755
--- a/src/main/java/net/minecraft/client/gui/inventory/GuiBeacon.java
+++ b/src/main/java/net/minecraft/client/gui/inventory/GuiBeacon.java
@@ -175,7 +175,8 @@ public class GuiBeacon extends GuiContainer {
 		this.drawCenteredString(this.fontRendererObj, I18n.format("tile.beacon.secondary", new Object[0]), 169, 10,
 				14737632);
 
-		for (GuiButton guibutton : this.buttonList) {
+		for (int k = 0, l = this.buttonList.size(); k < l; ++k) {
+			GuiButton guibutton = this.buttonList.get(k);
 			if (guibutton.isMouseOver()) {
 				guibutton.drawButtonForegroundLayer(i - this.guiLeft, j - this.guiTop);
 				break;
diff --git a/src/main/java/net/minecraft/client/gui/inventory/GuiContainer.java b/src/main/java/net/minecraft/client/gui/inventory/GuiContainer.java
index 0d62242..0cb07e4 100755
--- a/src/main/java/net/minecraft/client/gui/inventory/GuiContainer.java
+++ b/src/main/java/net/minecraft/client/gui/inventory/GuiContainer.java
@@ -1,11 +1,11 @@
 package net.minecraft.client.gui.inventory;
 
+import java.util.List;
 import java.util.Set;
 
 import com.google.common.collect.Sets;
 
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
-import net.lax1dude.eaglercraft.v1_8.internal.KeyboardConstants;
 import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
@@ -455,7 +455,9 @@ public abstract class GuiContainer extends GuiScreen {
 		if (this.doubleClick && slot != null && k == 0 && this.inventorySlots.canMergeSlot((ItemStack) null, slot)) {
 			if (isShiftKeyDown()) {
 				if (slot != null && slot.inventory != null && this.shiftClickedSlot != null) {
-					for (Slot slot2 : this.inventorySlots.inventorySlots) {
+					List<Slot> lst = this.inventorySlots.inventorySlots;
+					for (int n = 0, m = lst.size(); n < m; ++n) {
+						Slot slot2 = lst.get(n);
 						if (slot2 != null && slot2.canTakeStack(this.mc.thePlayer) && slot2.getHasStack()
 								&& slot2.inventory == slot.inventory
 								&& Container.canAddItemToSlot(slot2, this.shiftClickedSlot, true)) {
diff --git a/src/main/java/net/minecraft/client/gui/inventory/GuiContainerCreative.java b/src/main/java/net/minecraft/client/gui/inventory/GuiContainerCreative.java
index 014196b..891098c 100755
--- a/src/main/java/net/minecraft/client/gui/inventory/GuiContainerCreative.java
+++ b/src/main/java/net/minecraft/client/gui/inventory/GuiContainerCreative.java
@@ -310,7 +310,8 @@ public class GuiContainerCreative extends InventoryEffectRenderer {
 			}
 		}
 
-		for (Enchantment enchantment : Enchantment.enchantmentsBookList) {
+		for (int i = 0; i < Enchantment.enchantmentsBookList.length; ++i) {
+			Enchantment enchantment = Enchantment.enchantmentsBookList[i];
 			if (enchantment != null && enchantment.type != null) {
 				Items.enchanted_book.getAll(enchantment, guicontainercreative$containercreative.itemList);
 			}
@@ -323,8 +324,9 @@ public class GuiContainerCreative extends InventoryEffectRenderer {
 			ItemStack itemstack = (ItemStack) iterator.next();
 			boolean flag = false;
 
-			for (String s : itemstack.getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips)) {
-				if (EnumChatFormatting.getTextWithoutFormattingCodes(s).toLowerCase().contains(s1)) {
+			List<String> lst = itemstack.getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips);
+			for (int i = 0, l = lst.size(); i < l; ++i) {
+				if (EnumChatFormatting.getTextWithoutFormattingCodes(lst.get(i)).toLowerCase().contains(s1)) {
 					flag = true;
 					break;
 				}
@@ -362,8 +364,8 @@ public class GuiContainerCreative extends InventoryEffectRenderer {
 			int i = parInt1 - this.guiLeft;
 			int j = parInt2 - this.guiTop;
 
-			for (CreativeTabs creativetabs : CreativeTabs.creativeTabArray) {
-				if (this.func_147049_a(creativetabs, i, j)) {
+			for (int k = 0; k < CreativeTabs.creativeTabArray.length; ++k) {
+				if (this.func_147049_a(CreativeTabs.creativeTabArray[k], i, j)) {
 					return;
 				}
 			}
@@ -381,7 +383,8 @@ public class GuiContainerCreative extends InventoryEffectRenderer {
 			int l = i - this.guiLeft;
 			int i1 = j - this.guiTop;
 
-			for (CreativeTabs creativetabs : CreativeTabs.creativeTabArray) {
+			for (int m = 0; m < CreativeTabs.creativeTabArray.length; ++m) {
+				CreativeTabs creativetabs = CreativeTabs.creativeTabArray[m];
 				if (this.func_147049_a(creativetabs, l, i1)) {
 					this.setCurrentCreativeTab(creativetabs);
 					return;
@@ -520,8 +523,8 @@ public class GuiContainerCreative extends InventoryEffectRenderer {
 
 		super.drawScreen(i, j, f);
 
-		for (CreativeTabs creativetabs : CreativeTabs.creativeTabArray) {
-			if (this.renderCreativeInventoryHoveringText(creativetabs, i, j)) {
+		for (int m = 0; m < CreativeTabs.creativeTabArray.length; ++m) {
+			if (this.renderCreativeInventoryHoveringText(CreativeTabs.creativeTabArray[m], i, j)) {
 				Mouse.showCursor(EnumCursorType.HAND);
 				break;
 			}
@@ -547,7 +550,8 @@ public class GuiContainerCreative extends InventoryEffectRenderer {
 					Enchantment enchantment = Enchantment
 							.getEnchantmentById(((Integer) map.keySet().iterator().next()).intValue());
 
-					for (CreativeTabs creativetabs1 : CreativeTabs.creativeTabArray) {
+					for (int m = 0; m < CreativeTabs.creativeTabArray.length; ++m) {
+						CreativeTabs creativetabs1 = CreativeTabs.creativeTabArray[m];
 						if (creativetabs1.hasRelevantEnchantmentType(enchantment.type)) {
 							creativetabs = creativetabs1;
 							break;
@@ -584,7 +588,8 @@ public class GuiContainerCreative extends InventoryEffectRenderer {
 		RenderHelper.enableGUIStandardItemLighting();
 		CreativeTabs creativetabs = CreativeTabs.creativeTabArray[selectedTabIndex];
 
-		for (CreativeTabs creativetabs1 : CreativeTabs.creativeTabArray) {
+		for (int m = 0; m < CreativeTabs.creativeTabArray.length; ++m) {
+			CreativeTabs creativetabs1 = CreativeTabs.creativeTabArray[m];
 			this.mc.getTextureManager().bindTexture(creativeInventoryTabs);
 			if (creativetabs1.getTabIndex() != selectedTabIndex) {
 				this.func_147051_a(creativetabs1);
diff --git a/src/main/java/net/minecraft/client/gui/spectator/PlayerMenuObject.java b/src/main/java/net/minecraft/client/gui/spectator/PlayerMenuObject.java
index 611f2cf..f1003e5 100755
--- a/src/main/java/net/minecraft/client/gui/spectator/PlayerMenuObject.java
+++ b/src/main/java/net/minecraft/client/gui/spectator/PlayerMenuObject.java
@@ -3,12 +3,10 @@ package net.minecraft.client.gui.spectator;
 import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.AbstractClientPlayer;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.network.play.client.C18PacketSpectate;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.IChatComponent;
-import net.minecraft.util.ResourceLocation;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
diff --git a/src/main/java/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.java b/src/main/java/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.java
index 0800440..4e39cef 100755
--- a/src/main/java/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.java
+++ b/src/main/java/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.java
@@ -57,7 +57,9 @@ public class TeleportToPlayer implements ISpectatorMenuView, ISpectatorMenuObjec
 	public TeleportToPlayer(Collection<NetworkPlayerInfo> parCollection) {
 		this.field_178673_b = Lists.newArrayList();
 
-		for (NetworkPlayerInfo networkplayerinfo : field_178674_a.sortedCopy(parCollection)) {
+		List<NetworkPlayerInfo> lst = field_178674_a.sortedCopy(parCollection);
+		for (int i = 0, l = lst.size(); i < l; ++i) {
+			NetworkPlayerInfo networkplayerinfo = lst.get(i);
 			if (networkplayerinfo.getGameType() != WorldSettings.GameType.SPECTATOR) {
 				this.field_178673_b.add(new PlayerMenuObject(networkplayerinfo.getGameProfile()));
 			}
diff --git a/src/main/java/net/minecraft/client/gui/spectator/categories/TeleportToTeam.java b/src/main/java/net/minecraft/client/gui/spectator/categories/TeleportToTeam.java
index fe74552..80e3808 100755
--- a/src/main/java/net/minecraft/client/gui/spectator/categories/TeleportToTeam.java
+++ b/src/main/java/net/minecraft/client/gui/spectator/categories/TeleportToTeam.java
@@ -1,13 +1,10 @@
 package net.minecraft.client.gui.spectator.categories;
 
 import java.util.List;
-import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
-
 import com.google.common.collect.Lists;
 
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.AbstractClientPlayer;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.GuiSpectator;
@@ -76,8 +73,8 @@ public class TeleportToTeam implements ISpectatorMenuView, ISpectatorMenuObject
 	}
 
 	public boolean func_178662_A_() {
-		for (ISpectatorMenuObject ispectatormenuobject : this.field_178672_a) {
-			if (ispectatormenuobject.func_178662_A_()) {
+		for (int i = 0, l = this.field_178672_a.size(); i < l; ++i) {
+			if (this.field_178672_a.get(i).func_178662_A_()) {
 				return true;
 			}
 		}
diff --git a/src/main/java/net/minecraft/client/main/Main.java b/src/main/java/net/minecraft/client/main/Main.java
index 36817dd..5cfee0d 100755
--- a/src/main/java/net/minecraft/client/main/Main.java
+++ b/src/main/java/net/minecraft/client/main/Main.java
@@ -26,8 +26,7 @@ import net.minecraft.util.Session;
  */
 public class Main {
 	public static void appMain(String[] astring) {
-		System.setProperty("java.net.preferIPv4Stack", "true");
-
+		System.setProperty("java.net.preferIPv6Addresses", "true");
 		GameConfiguration gameconfiguration = new GameConfiguration(
 				new GameConfiguration.UserInformation(new Session()),
 				new GameConfiguration.DisplayInformation(854, 480, false, true),
diff --git a/src/main/java/net/minecraft/client/model/ModelGhast.java b/src/main/java/net/minecraft/client/model/ModelGhast.java
index 5752b40..7bbd379 100755
--- a/src/main/java/net/minecraft/client/model/ModelGhast.java
+++ b/src/main/java/net/minecraft/client/model/ModelGhast.java
@@ -74,8 +74,8 @@ public class ModelGhast extends ModelBase {
 		GlStateManager.translate(0.0F, 0.6F, 0.0F);
 		this.body.render(f5);
 
-		for (ModelRenderer modelrenderer : this.tentacles) {
-			modelrenderer.render(f5);
+		for (int i = 0; i < this.tentacles.length; ++i) {
+			this.tentacles[i].render(f5);
 		}
 
 		GlStateManager.popMatrix();
diff --git a/src/main/java/net/minecraft/client/model/ModelSquid.java b/src/main/java/net/minecraft/client/model/ModelSquid.java
index 02dcf4c..c6f52fa 100755
--- a/src/main/java/net/minecraft/client/model/ModelSquid.java
+++ b/src/main/java/net/minecraft/client/model/ModelSquid.java
@@ -55,8 +55,8 @@ public class ModelSquid extends ModelBase {
 	 * legs can swing at most.
 	 */
 	public void setRotationAngles(float var1, float var2, float f, float var4, float var5, float var6, Entity var7) {
-		for (ModelRenderer modelrenderer : this.squidTentacles) {
-			modelrenderer.rotateAngleX = f;
+		for (int i = 0; i < this.squidTentacles.length; ++i) {
+			this.squidTentacles[i].rotateAngleX = f;
 		}
 
 	}
diff --git a/src/main/java/net/minecraft/client/model/ModelWither.java b/src/main/java/net/minecraft/client/model/ModelWither.java
index f37c54f..70ad069 100755
--- a/src/main/java/net/minecraft/client/model/ModelWither.java
+++ b/src/main/java/net/minecraft/client/model/ModelWither.java
@@ -63,12 +63,12 @@ public class ModelWither extends ModelBase {
 	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
 		this.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
 
-		for (ModelRenderer modelrenderer : this.field_82904_b) {
-			modelrenderer.render(f5);
+		for (int i = 0; i < this.field_82904_b.length; ++i) {
+			this.field_82904_b[i].render(f5);
 		}
 
-		for (ModelRenderer modelrenderer1 : this.field_82905_a) {
-			modelrenderer1.render(f5);
+		for (int i = 0; i < this.field_82905_a.length; ++i) {
+			this.field_82905_a[i].render(f5);
 		}
 
 	}
diff --git a/src/main/java/net/minecraft/client/multiplayer/ChunkProviderClient.java b/src/main/java/net/minecraft/client/multiplayer/ChunkProviderClient.java
index b66dd6f..a5df971 100755
--- a/src/main/java/net/minecraft/client/multiplayer/ChunkProviderClient.java
+++ b/src/main/java/net/minecraft/client/multiplayer/ChunkProviderClient.java
@@ -126,8 +126,8 @@ public class ChunkProviderClient implements IChunkProvider {
 	public boolean unloadQueuedChunks() {
 		long i = System.currentTimeMillis();
 
-		for (Chunk chunk : this.chunkListing) {
-			chunk.func_150804_b(System.currentTimeMillis() - i > 5L);
+		for (int j = 0, k = this.chunkListing.size(); j < k; ++j) {
+			this.chunkListing.get(j).func_150804_b(System.currentTimeMillis() - i > 5L);
 		}
 
 		if (System.currentTimeMillis() - i > 100L) {
diff --git a/src/main/java/net/minecraft/client/multiplayer/ServerData.java b/src/main/java/net/minecraft/client/multiplayer/ServerData.java
index 46e3941..1be6e9c 100755
--- a/src/main/java/net/minecraft/client/multiplayer/ServerData.java
+++ b/src/main/java/net/minecraft/client/multiplayer/ServerData.java
@@ -153,6 +153,8 @@ public class ServerData {
 	public static enum ServerResourceMode {
 		ENABLED("enabled"), DISABLED("disabled"), PROMPT("prompt");
 
+		public static final ServerResourceMode[] _VALUES = values();
+
 		private final IChatComponent motd;
 
 		private ServerResourceMode(String parString2) {
diff --git a/src/main/java/net/minecraft/client/multiplayer/ServerList.java b/src/main/java/net/minecraft/client/multiplayer/ServerList.java
index d671993..82b9aa9 100755
--- a/src/main/java/net/minecraft/client/multiplayer/ServerList.java
+++ b/src/main/java/net/minecraft/client/multiplayer/ServerList.java
@@ -1,13 +1,12 @@
 package net.minecraft.client.multiplayer;
 
-import java.io.ByteArrayOutputStream;
-import java.util.Iterator;
 import java.util.List;
 
 import com.google.common.collect.Lists;
 
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
+import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumServerRateLimit;
 import net.lax1dude.eaglercraft.v1_8.internal.IClientConfigAdapter.DefaultServer;
 import net.lax1dude.eaglercraft.v1_8.internal.QueryResponse;
@@ -16,7 +15,6 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.socket.AddressResolver;
 import net.lax1dude.eaglercraft.v1_8.socket.RateLimitTracker;
 import net.lax1dude.eaglercraft.v1_8.socket.ServerQueryDispatch;
-import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayManager;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.nbt.CompressedStreamTools;
@@ -74,6 +72,15 @@ public class ServerList {
 	 * found in the "servers" tag list.
 	 */
 	public void loadServerList() {
+		loadServerList(EagRuntime.getStorage("s"));
+	}
+
+	/**+
+	 * Loads a list of servers from servers.dat, by running
+	 * ServerData.getServerDataFromNBTCompound on each NBT compound
+	 * found in the "servers" tag list.
+	 */
+	public void loadServerList(byte[] localStorage) {
 		try {
 			freeServerIcons();
 
@@ -84,8 +91,6 @@ public class ServerList {
 				this.allServers.add(dat);
 			}
 
-			byte[] localStorage = EagRuntime.getStorage("s");
-
 			if (localStorage != null) {
 				NBTTagCompound nbttagcompound = CompressedStreamTools
 						.readCompressed(new EaglerInputStream(localStorage));
@@ -115,10 +120,18 @@ public class ServerList {
 	 * servers.dat.
 	 */
 	public void saveServerList() {
+		byte[] data = writeServerList();
+		if (data != null) {
+			EagRuntime.setStorage("s", data);
+		}
+	}
+
+	public byte[] writeServerList() {
 		try {
 			NBTTagList nbttaglist = new NBTTagList();
 
-			for (ServerData serverdata : this.servers) {
+			for (int i = 0, l = this.servers.size(); i < l; ++i) {
+				ServerData serverdata = this.servers.get(i);
 				if (!serverdata.isDefault) {
 					nbttaglist.appendTag(serverdata.getNBTCompound());
 				}
@@ -127,12 +140,13 @@ public class ServerList {
 			NBTTagCompound nbttagcompound = new NBTTagCompound();
 			nbttagcompound.setTag("servers", nbttaglist);
 
-			ByteArrayOutputStream bao = new ByteArrayOutputStream();
+			EaglerOutputStream bao = new EaglerOutputStream();
 			CompressedStreamTools.writeCompressed(nbttagcompound, bao);
-			EagRuntime.setStorage("s", bao.toByteArray());
+			return bao.toByteArray();
 
 		} catch (Exception exception) {
 			logger.error("Couldn\'t save server list", exception);
+			return null;
 		}
 
 	}
@@ -215,7 +229,8 @@ public class ServerList {
 	public void refreshServerPing() {
 		this.servers.clear();
 		this.servers.addAll(this.allServers);
-		for (ServerData dat : servers) {
+		for (int i = 0, l = this.servers.size(); i < l; ++i) {
+			ServerData dat = this.servers.get(i);
 			if (dat.currentQuery != null) {
 				if (dat.currentQuery.isOpen()) {
 					dat.currentQuery.close();
@@ -229,9 +244,8 @@ public class ServerList {
 
 	public void updateServerPing() {
 		int total = 0;
-		Iterator<ServerData> itr = servers.iterator();
-		while (itr.hasNext()) {
-			ServerData dat = itr.next();
+		for (int i = 0, l = this.servers.size(); i < l; ++i) {
+			ServerData dat = this.servers.get(i);
 			if (dat.pingSentTime <= 0l) {
 				dat.pingSentTime = System.currentTimeMillis();
 				if (RateLimitTracker.isLockedOut(dat.serverIP)) {
diff --git a/src/main/java/net/minecraft/client/network/NetHandlerPlayClient.java b/src/main/java/net/minecraft/client/network/NetHandlerPlayClient.java
index fb80bf4..da0f27d 100755
--- a/src/main/java/net/minecraft/client/network/NetHandlerPlayClient.java
+++ b/src/main/java/net/minecraft/client/network/NetHandlerPlayClient.java
@@ -21,6 +21,7 @@ import net.lax1dude.eaglercraft.v1_8.sp.socket.ClientIntegratedServerNetworkMana
 import net.lax1dude.eaglercraft.v1_8.update.UpdateService;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerFolderResourcePack;
 import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
 import net.minecraft.block.Block;
 import net.minecraft.client.ClientBrandRetriever;
@@ -135,8 +136,10 @@ import net.minecraft.network.play.server.S1DPacketEntityEffect;
 import net.minecraft.network.play.server.S1EPacketRemoveEntityEffect;
 import net.minecraft.network.play.server.S1FPacketSetExperience;
 import net.minecraft.network.play.server.S20PacketEntityProperties;
+import net.minecraft.network.play.server.S20PacketEntityProperties.Snapshot;
 import net.minecraft.network.play.server.S21PacketChunkData;
 import net.minecraft.network.play.server.S22PacketMultiBlockChange;
+import net.minecraft.network.play.server.S22PacketMultiBlockChange.BlockUpdateData;
 import net.minecraft.network.play.server.S23PacketBlockChange;
 import net.minecraft.network.play.server.S24PacketBlockAction;
 import net.minecraft.network.play.server.S25PacketBlockBreakAnim;
@@ -159,6 +162,7 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
 import net.minecraft.network.play.server.S36PacketSignEditorOpen;
 import net.minecraft.network.play.server.S37PacketStatistics;
 import net.minecraft.network.play.server.S38PacketPlayerListItem;
+import net.minecraft.network.play.server.S38PacketPlayerListItem.AddPlayerData;
 import net.minecraft.network.play.server.S39PacketPlayerAbilities;
 import net.minecraft.network.play.server.S3APacketTabComplete;
 import net.minecraft.network.play.server.S3BPacketScoreboardObjective;
@@ -664,8 +668,9 @@ public class NetHandlerPlayClient implements INetHandlerPlayClient {
 	 * more blocks are changed, the server sends S21PacketChunkData
 	 */
 	public void handleMultiBlockChange(S22PacketMultiBlockChange packetIn) {
-		for (S22PacketMultiBlockChange.BlockUpdateData s22packetmultiblockchange$blockupdatedata : packetIn
-				.getChangedBlocks()) {
+		BlockUpdateData[] dat = packetIn.getChangedBlocks();
+		for (int i = 0; i < dat.length; ++i) {
+			BlockUpdateData s22packetmultiblockchange$blockupdatedata = dat[i];
 			this.clientWorldController.invalidateRegionAndSetBlock(s22packetmultiblockchange$blockupdatedata.getPos(),
 					s22packetmultiblockchange$blockupdatedata.getBlockState());
 		}
@@ -1361,7 +1366,9 @@ public class NetHandlerPlayClient implements INetHandlerPlayClient {
 	}
 
 	public void handlePlayerListItem(S38PacketPlayerListItem packetIn) {
-		for (S38PacketPlayerListItem.AddPlayerData s38packetplayerlistitem$addplayerdata : packetIn.func_179767_a()) {
+		List<AddPlayerData> lst = packetIn.func_179767_a();
+		for (int i = 0, l = lst.size(); i < l; ++i) {
+			S38PacketPlayerListItem.AddPlayerData s38packetplayerlistitem$addplayerdata = lst.get(i);
 			if (packetIn.func_179768_b() == S38PacketPlayerListItem.Action.REMOVE_PLAYER) {
 				EaglercraftUUID uuid = s38packetplayerlistitem$addplayerdata.getProfile().getId();
 				this.playerInfoMap.remove(uuid);
@@ -1430,7 +1437,7 @@ public class NetHandlerPlayClient implements INetHandlerPlayClient {
 	public void handleResourcePack(S48PacketResourcePackSend packetIn) {
 		final String s = packetIn.getURL();
 		final String s1 = packetIn.getHash();
-		if (s.startsWith("level://")) {
+		if (!EaglerFolderResourcePack.isSupported() || s.startsWith("level://")) {
 			this.netManager
 					.sendPacket(new C19PacketResourcePackStatus(s1, C19PacketResourcePackStatus.Action.DECLINED));
 			return;
@@ -1716,7 +1723,9 @@ public class NetHandlerPlayClient implements INetHandlerPlayClient {
 			} else {
 				BaseAttributeMap baseattributemap = ((EntityLivingBase) entity).getAttributeMap();
 
-				for (S20PacketEntityProperties.Snapshot s20packetentityproperties$snapshot : packetIn.func_149441_d()) {
+				List<Snapshot> lst = packetIn.func_149441_d();
+				for (int i = 0, l = lst.size(); i < l; ++i) {
+					S20PacketEntityProperties.Snapshot s20packetentityproperties$snapshot = lst.get(i);
 					IAttributeInstance iattributeinstance = baseattributemap
 							.getAttributeInstanceByName(s20packetentityproperties$snapshot.func_151409_a());
 					if (iattributeinstance == null) {
diff --git a/src/main/java/net/minecraft/client/network/NetworkPlayerInfo.java b/src/main/java/net/minecraft/client/network/NetworkPlayerInfo.java
index 1f3e773..2080def 100755
--- a/src/main/java/net/minecraft/client/network/NetworkPlayerInfo.java
+++ b/src/main/java/net/minecraft/client/network/NetworkPlayerInfo.java
@@ -1,11 +1,7 @@
 package net.minecraft.client.network;
 
-import com.google.common.base.Objects;
-
 import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
-import net.lax1dude.eaglercraft.v1_8.profile.EaglerProfile;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.DefaultPlayerSkin;
 import net.minecraft.network.play.server.S38PacketPlayerListItem;
 import net.minecraft.scoreboard.ScorePlayerTeam;
 import net.minecraft.util.IChatComponent;
diff --git a/src/main/java/net/minecraft/client/particle/EffectRenderer.java b/src/main/java/net/minecraft/client/particle/EffectRenderer.java
index 9d1bb19..65a56bb 100755
--- a/src/main/java/net/minecraft/client/particle/EffectRenderer.java
+++ b/src/main/java/net/minecraft/client/particle/EffectRenderer.java
@@ -181,7 +181,8 @@ public class EffectRenderer {
 
 		ArrayList arraylist = Lists.newArrayList();
 
-		for (EntityParticleEmitter entityparticleemitter : this.particleEmitters) {
+		for (int i = 0, l = this.particleEmitters.size(); i < l; ++i) {
+			EntityParticleEmitter entityparticleemitter = this.particleEmitters.get(i);
 			entityparticleemitter.onUpdate();
 			if (entityparticleemitter.isDead) {
 				arraylist.add(entityparticleemitter);
diff --git a/src/main/java/net/minecraft/client/renderer/ActiveRenderInfo.java b/src/main/java/net/minecraft/client/renderer/ActiveRenderInfo.java
index a441b12..3dbffbd 100755
--- a/src/main/java/net/minecraft/client/renderer/ActiveRenderInfo.java
+++ b/src/main/java/net/minecraft/client/renderer/ActiveRenderInfo.java
@@ -2,10 +2,6 @@ package net.minecraft.client.renderer;
 
 import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
 
-import net.lax1dude.eaglercraft.v1_8.EagRuntime;
-import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
-import net.lax1dude.eaglercraft.v1_8.internal.buffer.IntBuffer;
-
 import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.minecraft.block.Block;
diff --git a/src/main/java/net/minecraft/client/renderer/BlockFluidRenderer.java b/src/main/java/net/minecraft/client/renderer/BlockFluidRenderer.java
index 107caf1..6b4c069 100755
--- a/src/main/java/net/minecraft/client/renderer/BlockFluidRenderer.java
+++ b/src/main/java/net/minecraft/client/renderer/BlockFluidRenderer.java
@@ -10,7 +10,6 @@ import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.MathHelper;
diff --git a/src/main/java/net/minecraft/client/renderer/BlockModelRenderer.java b/src/main/java/net/minecraft/client/renderer/BlockModelRenderer.java
index 0807bca..666490f 100755
--- a/src/main/java/net/minecraft/client/renderer/BlockModelRenderer.java
+++ b/src/main/java/net/minecraft/client/renderer/BlockModelRenderer.java
@@ -74,11 +74,13 @@ public class BlockModelRenderer {
 	public boolean renderModelAmbientOcclusion(IBlockAccess blockAccessIn, IBakedModel modelIn, Block blockIn,
 			BlockPos blockPosIn, WorldRenderer worldRendererIn, boolean checkSides) {
 		boolean flag = false;
-		float[] afloat = new float[EnumFacing.values().length * 2];
+		float[] afloat = new float[EnumFacing._VALUES.length * 2];
 		BitSet bitset = new BitSet(3);
 		BlockModelRenderer.AmbientOcclusionFace blockmodelrenderer$ambientocclusionface = new BlockModelRenderer.AmbientOcclusionFace();
 
-		for (EnumFacing enumfacing : EnumFacing.values()) {
+		EnumFacing[] facings = EnumFacing._VALUES;
+		for (int i = 0; i < facings.length; ++i) {
+			EnumFacing enumfacing = facings[i];
 			List list = modelIn.getFaceQuads(enumfacing);
 			if (!list.isEmpty()) {
 				BlockPos blockpos = blockPosIn.offset(enumfacing);
@@ -104,11 +106,13 @@ public class BlockModelRenderer {
 			BlockPos blockPosIn, WorldRenderer worldRendererIn, boolean checkSides) {
 		boolean isDeferred = DeferredStateManager.isDeferredRenderer();
 		boolean flag = false;
-		float[] afloat = isDeferred ? new float[EnumFacing.values().length * 2] : null;
+		float[] afloat = isDeferred ? new float[EnumFacing._VALUES.length * 2] : null;
 		BitSet bitset = new BitSet(3);
 
 		BlockPos.MutableBlockPos pointer = new BlockPos.MutableBlockPos();
-		for (EnumFacing enumfacing : EnumFacing.values()) {
+		EnumFacing[] facings = EnumFacing._VALUES;
+		for (int m = 0; m < facings.length; ++m) {
+			EnumFacing enumfacing = facings[m];
 			List list = modelIn.getFaceQuads(enumfacing);
 			if (!list.isEmpty()) {
 				BlockPos blockpos = blockPosIn.offsetEvenFaster(enumfacing, pointer);
@@ -148,7 +152,8 @@ public class BlockModelRenderer {
 			}
 		}
 
-		for (BakedQuad bakedquad : listQuadsIn) {
+		for (int i = 0, l = listQuadsIn.size(); i < l; ++i) {
+			BakedQuad bakedquad = listQuadsIn.get(i);
 			int[] vertData = isDeferred ? bakedquad.getVertexDataWithNormals() : bakedquad.getVertexData();
 			this.fillQuadBounds(blockIn, vertData, bakedquad.getFace(), quadBounds, boundsFlags, isDeferred ? 8 : 7);
 			aoFaceIn.updateVertexBrightness(blockAccessIn, blockIn, blockPosIn, bakedquad.getFace(), quadBounds,
@@ -218,12 +223,12 @@ public class BlockModelRenderer {
 			quadBounds[EnumFacing.UP.getIndex()] = f4;
 			quadBounds[EnumFacing.NORTH.getIndex()] = f2;
 			quadBounds[EnumFacing.SOUTH.getIndex()] = f5;
-			quadBounds[EnumFacing.WEST.getIndex() + EnumFacing.values().length] = 1.0F - f;
-			quadBounds[EnumFacing.EAST.getIndex() + EnumFacing.values().length] = 1.0F - f3;
-			quadBounds[EnumFacing.DOWN.getIndex() + EnumFacing.values().length] = 1.0F - f1;
-			quadBounds[EnumFacing.UP.getIndex() + EnumFacing.values().length] = 1.0F - f4;
-			quadBounds[EnumFacing.NORTH.getIndex() + EnumFacing.values().length] = 1.0F - f2;
-			quadBounds[EnumFacing.SOUTH.getIndex() + EnumFacing.values().length] = 1.0F - f5;
+			quadBounds[EnumFacing.WEST.getIndex() + EnumFacing._VALUES.length] = 1.0F - f;
+			quadBounds[EnumFacing.EAST.getIndex() + EnumFacing._VALUES.length] = 1.0F - f3;
+			quadBounds[EnumFacing.DOWN.getIndex() + EnumFacing._VALUES.length] = 1.0F - f1;
+			quadBounds[EnumFacing.UP.getIndex() + EnumFacing._VALUES.length] = 1.0F - f4;
+			quadBounds[EnumFacing.NORTH.getIndex() + EnumFacing._VALUES.length] = 1.0F - f2;
+			quadBounds[EnumFacing.SOUTH.getIndex() + EnumFacing._VALUES.length] = 1.0F - f5;
 		}
 
 		float f9 = 1.0E-4F;
@@ -283,7 +288,8 @@ public class BlockModelRenderer {
 			}
 		}
 
-		for (BakedQuad bakedquad : listQuadsIn) {
+		for (int m = 0, n = listQuadsIn.size(); m < n; ++m) {
+			BakedQuad bakedquad = listQuadsIn.get(m);
 			EnumFacing facingIn = bakedquad.getFace();
 			int[] vertData = isDeferred ? bakedquad.getVertexDataWithNormals() : bakedquad.getVertexData();
 			blockPosIn.offsetEvenFaster(facingIn, blockpos0);
@@ -429,7 +435,9 @@ public class BlockModelRenderer {
 
 	public void renderModelBrightnessColor(IBakedModel bakedModel, float parFloat1, float parFloat2, float parFloat3,
 			float parFloat4) {
-		for (EnumFacing enumfacing : EnumFacing.values()) {
+		EnumFacing[] facings = EnumFacing._VALUES;
+		for (int i = 0; i < facings.length; ++i) {
+			EnumFacing enumfacing = facings[i];
 			this.renderModelBrightnessColorQuads(parFloat1, parFloat2, parFloat3, parFloat4,
 					bakedModel.getFaceQuads(enumfacing));
 		}
@@ -462,7 +470,8 @@ public class BlockModelRenderer {
 		Tessellator tessellator = Tessellator.getInstance();
 		WorldRenderer worldrenderer = tessellator.getWorldRenderer();
 
-		for (BakedQuad bakedquad : parList) {
+		for (int i = 0, l = parList.size(); i < l; ++i) {
+			BakedQuad bakedquad = parList.get(i);
 			worldrenderer.begin(7, DefaultVertexFormats.ITEM);
 			worldrenderer.addVertexData(bakedquad.getVertexData());
 			if (bakedquad.hasTintIndex()) {
@@ -800,7 +809,7 @@ public class BlockModelRenderer {
 		protected final int field_178229_m;
 
 		private Orientation(EnumFacing parEnumFacing, boolean parFlag) {
-			this.field_178229_m = parEnumFacing.getIndex() + (parFlag ? EnumFacing.values().length : 0);
+			this.field_178229_m = parEnumFacing.getIndex() + (parFlag ? EnumFacing._VALUES.length : 0);
 		}
 	}
 
diff --git a/src/main/java/net/minecraft/client/renderer/EntityRenderer.java b/src/main/java/net/minecraft/client/renderer/EntityRenderer.java
index 90e65a2..d192734 100755
--- a/src/main/java/net/minecraft/client/renderer/EntityRenderer.java
+++ b/src/main/java/net/minecraft/client/renderer/EntityRenderer.java
@@ -1302,8 +1302,6 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 	}
 
 	private void addRainParticles() {
-		if (DeferredStateManager.isDeferredRenderer())
-			return;
 		float f = this.mc.theWorld.getRainStrength(1.0F);
 		if (!this.mc.gameSettings.fancyGraphics) {
 			f /= 2.0F;
@@ -1351,9 +1349,11 @@ public class EntityRenderer implements IResourceManagerReloadListener {
 							d2 = (double) blockpos2.getZ() + d4;
 						}
 
-						this.mc.theWorld.spawnParticle(EnumParticleTypes.WATER_DROP, (double) blockpos2.getX() + d3,
-								(double) ((float) blockpos2.getY() + 0.1F) + block.getBlockBoundsMaxY(),
-								(double) blockpos2.getZ() + d4, 0.0D, 0.0D, 0.0D, new int[0]);
+						if (!DeferredStateManager.isDeferredRenderer()) {
+							this.mc.theWorld.spawnParticle(EnumParticleTypes.WATER_DROP, (double) blockpos2.getX() + d3,
+									(double) ((float) blockpos2.getY() + 0.1F) + block.getBlockBoundsMaxY(),
+									(double) blockpos2.getZ() + d4, 0.0D, 0.0D, 0.0D, new int[0]);
+						}
 					}
 				}
 			}
diff --git a/src/main/java/net/minecraft/client/renderer/RegionRenderCacheBuilder.java b/src/main/java/net/minecraft/client/renderer/RegionRenderCacheBuilder.java
index 723bac3..f758d15 100755
--- a/src/main/java/net/minecraft/client/renderer/RegionRenderCacheBuilder.java
+++ b/src/main/java/net/minecraft/client/renderer/RegionRenderCacheBuilder.java
@@ -24,7 +24,7 @@ import net.minecraft.util.EnumWorldBlockLayer;
  * 
  */
 public class RegionRenderCacheBuilder {
-	private final WorldRenderer[] worldRenderers = new WorldRenderer[EnumWorldBlockLayer.values().length];
+	private final WorldRenderer[] worldRenderers = new WorldRenderer[EnumWorldBlockLayer._VALUES.length];
 
 	public RegionRenderCacheBuilder() {
 		this.worldRenderers[EnumWorldBlockLayer.SOLID.ordinal()] = new WorldRenderer(2097152);
diff --git a/src/main/java/net/minecraft/client/renderer/RenderGlobal.java b/src/main/java/net/minecraft/client/renderer/RenderGlobal.java
index eae9475..0abc968 100755
--- a/src/main/java/net/minecraft/client/renderer/RenderGlobal.java
+++ b/src/main/java/net/minecraft/client/renderer/RenderGlobal.java
@@ -524,7 +524,9 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 
 			this.theWorld.theProfiler.endStartSection("entities");
 
-			label738: for (RenderGlobal.ContainerLocalRenderInformation renderglobal$containerlocalrenderinformation : this.renderInfos) {
+			label738: for (int ii = 0, ll = this.renderInfos.size(); ii < ll; ++ii) {
+				RenderGlobal.ContainerLocalRenderInformation renderglobal$containerlocalrenderinformation = this.renderInfos
+						.get(ii);
 				Chunk chunk = this.theWorld.getChunkFromBlockCoords(
 						renderglobal$containerlocalrenderinformation.renderChunk.getPosition());
 				ClassInheritanceMultiMap classinheritancemultimap = chunk
@@ -574,12 +576,15 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 			this.theWorld.theProfiler.endStartSection("blockentities");
 			RenderHelper.enableStandardItemLighting();
 
-			for (RenderGlobal.ContainerLocalRenderInformation renderglobal$containerlocalrenderinformation1 : this.renderInfos) {
+			for (int ii = 0, ll = this.renderInfos.size(); ii < ll; ++ii) {
+				RenderGlobal.ContainerLocalRenderInformation renderglobal$containerlocalrenderinformation1 = this.renderInfos
+						.get(ii);
 				List list1 = renderglobal$containerlocalrenderinformation1.renderChunk.getCompiledChunk()
 						.getTileEntities();
 				if (!list1.isEmpty()) {
-					for (TileEntity tileentity2 : (List<TileEntity>) list1) {
-						TileEntityRendererDispatcher.instance.renderTileEntity(tileentity2, partialTicks, -1);
+					for (int m = 0, n = list1.size(); m < n; ++m) {
+						TileEntityRendererDispatcher.instance.renderTileEntity((TileEntity) list1.get(m), partialTicks,
+								-1);
 					}
 				}
 			}
@@ -786,7 +791,9 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 		int i = this.viewFrustum.renderChunks.length;
 		int j = 0;
 
-		for (RenderGlobal.ContainerLocalRenderInformation renderglobal$containerlocalrenderinformation : this.renderInfos) {
+		for (int ii = 0, ll = this.renderInfos.size(); ii < ll; ++ii) {
+			RenderGlobal.ContainerLocalRenderInformation renderglobal$containerlocalrenderinformation = this.renderInfos
+					.get(ii);
 			CompiledChunk compiledchunk = renderglobal$containerlocalrenderinformation.renderChunk.compiledChunk;
 			if (compiledchunk != CompiledChunk.DUMMY && !compiledchunk.isEmpty()) {
 				++j;
@@ -912,7 +919,9 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 				EnumFacing enumfacing2 = renderglobal$containerlocalrenderinformation1.facing;
 				BlockPos blockpos2 = renderchunk3.getPosition();
 				this.renderInfos.add(renderglobal$containerlocalrenderinformation1);
-				for (EnumFacing enumfacing1 : EnumFacing.values()) {
+				EnumFacing[] facings = EnumFacing._VALUES;
+				for (int i = 0; i < facings.length; ++i) {
+					EnumFacing enumfacing1 = facings[i];
 					RenderChunk renderchunk2 = this.func_181562_a(blockpos, renderchunk3, enumfacing1);
 					if ((!flag1 || !renderglobal$containerlocalrenderinformation1.setFacing // TODO:
 							.contains(enumfacing1.getOpposite()))
@@ -940,7 +949,9 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 		Set set = this.chunksToUpdate;
 		this.chunksToUpdate = Sets.newLinkedHashSet();
 
-		for (RenderGlobal.ContainerLocalRenderInformation renderglobal$containerlocalrenderinformation2 : this.renderInfos) {
+		for (int ii = 0, ll = this.renderInfos.size(); ii < ll; ++ii) {
+			RenderGlobal.ContainerLocalRenderInformation renderglobal$containerlocalrenderinformation2 = this.renderInfos
+					.get(ii);
 			RenderChunk renderchunk4 = renderglobal$containerlocalrenderinformation2.renderChunk;
 			if (renderchunk4.isNeedsUpdate() || set.contains(renderchunk4)) {
 				this.displayListEntitiesDirty = true;
@@ -1065,7 +1076,9 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 				this.prevRenderSortZ = entityIn.posZ;
 				int k = 0;
 
-				for (RenderGlobal.ContainerLocalRenderInformation renderglobal$containerlocalrenderinformation : this.renderInfos) {
+				for (int ii = 0, ll = this.renderInfos.size(); ii < ll; ++ii) {
+					RenderGlobal.ContainerLocalRenderInformation renderglobal$containerlocalrenderinformation = this.renderInfos
+							.get(ii);
 					if (renderglobal$containerlocalrenderinformation.renderChunk.compiledChunk
 							.isLayerStarted(blockLayerIn) && k++ < 15) {
 						this.renderDispatcher
@@ -2488,7 +2501,9 @@ public class RenderGlobal implements IWorldAccess, IResourceManagerReloadListene
 		int j = 0;
 		int k = 0;
 
-		for (RenderGlobal.ContainerLocalRenderInformation renderglobal$containerlocalrenderinformation : this.renderInfos) {
+		for (int ii = 0, ll = this.renderInfos.size(); ii < ll; ++ii) {
+			RenderGlobal.ContainerLocalRenderInformation renderglobal$containerlocalrenderinformation = this.renderInfos
+					.get(ii);
 			CompiledChunk compiledchunk = renderglobal$containerlocalrenderinformation.renderChunk.compiledChunk;
 			if (compiledchunk != CompiledChunk.DUMMY && !compiledchunk.isEmpty()) {
 				++j;
diff --git a/src/main/java/net/minecraft/client/renderer/RenderList.java b/src/main/java/net/minecraft/client/renderer/RenderList.java
index 2615cab..7d9d4e3 100755
--- a/src/main/java/net/minecraft/client/renderer/RenderList.java
+++ b/src/main/java/net/minecraft/client/renderer/RenderList.java
@@ -3,7 +3,6 @@ package net.minecraft.client.renderer;
 import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.minecraft.client.renderer.chunk.ListedRenderChunk;
-import net.minecraft.client.renderer.chunk.RenderChunk;
 import net.minecraft.util.EnumWorldBlockLayer;
 
 /**+
@@ -29,10 +28,10 @@ import net.minecraft.util.EnumWorldBlockLayer;
 public class RenderList extends ChunkRenderContainer {
 	public void renderChunkLayer(EnumWorldBlockLayer enumworldblocklayer) {
 		if (this.initialized) {
-			for (RenderChunk renderchunk : this.renderChunks) {
-				ListedRenderChunk listedrenderchunk = (ListedRenderChunk) renderchunk;
+			for (int i = 0, l = this.renderChunks.size(); i < l; ++i) {
+				ListedRenderChunk listedrenderchunk = (ListedRenderChunk) this.renderChunks.get(i);
 				GlStateManager.pushMatrix();
-				this.preRenderChunk(renderchunk, enumworldblocklayer);
+				this.preRenderChunk(listedrenderchunk, enumworldblocklayer);
 				EaglercraftGPU.glCallList(
 						listedrenderchunk.getDisplayList(enumworldblocklayer, listedrenderchunk.getCompiledChunk()));
 				GlStateManager.popMatrix();
diff --git a/src/main/java/net/minecraft/client/renderer/ViewFrustum.java b/src/main/java/net/minecraft/client/renderer/ViewFrustum.java
index 59efc21..dcd529c 100755
--- a/src/main/java/net/minecraft/client/renderer/ViewFrustum.java
+++ b/src/main/java/net/minecraft/client/renderer/ViewFrustum.java
@@ -61,8 +61,8 @@ public class ViewFrustum {
 	}
 
 	public void deleteGlResources() {
-		for (RenderChunk renderchunk : this.renderChunks) {
-			renderchunk.deleteGlResources();
+		for (int i = 0; i < this.renderChunks.length; ++i) {
+			renderChunks[i].deleteGlResources();
 		}
 
 	}
diff --git a/src/main/java/net/minecraft/client/renderer/block/model/BreakingFour.java b/src/main/java/net/minecraft/client/renderer/block/model/BreakingFour.java
index 07db39c..46d6dc2 100755
--- a/src/main/java/net/minecraft/client/renderer/block/model/BreakingFour.java
+++ b/src/main/java/net/minecraft/client/renderer/block/model/BreakingFour.java
@@ -3,7 +3,6 @@ package net.minecraft.client.renderer.block.model;
 import java.util.Arrays;
 
 import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
-import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DeferredStateManager;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
diff --git a/src/main/java/net/minecraft/client/renderer/block/model/FaceBakery.java b/src/main/java/net/minecraft/client/renderer/block/model/FaceBakery.java
index f17110e..86eb5bb 100755
--- a/src/main/java/net/minecraft/client/renderer/block/model/FaceBakery.java
+++ b/src/main/java/net/minecraft/client/renderer/block/model/FaceBakery.java
@@ -105,7 +105,7 @@ public class FaceBakery {
 	}
 
 	private float[] getPositionsDiv16(Vector3f pos1, Vector3f pos2) {
-		float[] afloat = new float[EnumFacing.values().length];
+		float[] afloat = new float[EnumFacing._VALUES.length];
 		afloat[EnumFaceDirection.Constants.WEST_INDEX] = pos1.x / 16.0F;
 		afloat[EnumFaceDirection.Constants.DOWN_INDEX] = pos1.y / 16.0F;
 		afloat[EnumFaceDirection.Constants.NORTH_INDEX] = pos1.z / 16.0F;
@@ -252,7 +252,9 @@ public class FaceBakery {
 		EnumFacing enumfacing = null;
 		float f1 = 0.0F;
 
-		for (EnumFacing enumfacing1 : EnumFacing.values()) {
+		EnumFacing[] facings = EnumFacing._VALUES;
+		for (int i = 0; i < facings.length; ++i) {
+			EnumFacing enumfacing1 = facings[i];
 			Vec3i vec3i = enumfacing1.getDirectionVec();
 			Vector3f vector3f6 = new Vector3f((float) vec3i.getX(), (float) vec3i.getY(), (float) vec3i.getZ());
 			float f2 = Vector3f.dot(normal, vector3f6);
@@ -280,7 +282,7 @@ public class FaceBakery {
 	private void func_178408_a(int[] parArrayOfInt, EnumFacing parEnumFacing) {
 		int[] aint = new int[parArrayOfInt.length];
 		System.arraycopy(parArrayOfInt, 0, aint, 0, parArrayOfInt.length);
-		float[] afloat = new float[EnumFacing.values().length];
+		float[] afloat = new float[EnumFacing._VALUES.length];
 		afloat[EnumFaceDirection.Constants.WEST_INDEX] = 999.0F;
 		afloat[EnumFaceDirection.Constants.DOWN_INDEX] = 999.0F;
 		afloat[EnumFaceDirection.Constants.NORTH_INDEX] = 999.0F;
diff --git a/src/main/java/net/minecraft/client/renderer/block/model/ItemModelGenerator.java b/src/main/java/net/minecraft/client/renderer/block/model/ItemModelGenerator.java
index a8581f9..790e8c8 100755
--- a/src/main/java/net/minecraft/client/renderer/block/model/ItemModelGenerator.java
+++ b/src/main/java/net/minecraft/client/renderer/block/model/ItemModelGenerator.java
@@ -83,7 +83,9 @@ public class ItemModelGenerator {
 		float f1 = (float) parTextureAtlasSprite.getIconHeight();
 		ArrayList arraylist = Lists.newArrayList();
 
-		for (ItemModelGenerator.Span itemmodelgenerator$span : this.func_178393_a(parTextureAtlasSprite)) {
+		List<ItemModelGenerator.Span> lst = this.func_178393_a(parTextureAtlasSprite);
+		for (int i = 0, l = lst.size(); i < l; ++i) {
+			ItemModelGenerator.Span itemmodelgenerator$span = lst.get(i);
 			float f2 = 0.0F;
 			float f3 = 0.0F;
 			float f4 = 0.0F;
@@ -217,7 +219,8 @@ public class ItemModelGenerator {
 			int parInt1, int parInt2) {
 		ItemModelGenerator.Span itemmodelgenerator$span = null;
 
-		for (ItemModelGenerator.Span itemmodelgenerator$span1 : parList) {
+		for (int j = 0, l = parList.size(); j < l; ++j) {
+			ItemModelGenerator.Span itemmodelgenerator$span1 = parList.get(j);
 			if (itemmodelgenerator$span1.func_178383_a() == parSpanFacing) {
 				int i = parSpanFacing.func_178369_d() ? parInt2 : parInt1;
 				if (itemmodelgenerator$span1.func_178381_d() == i) {
diff --git a/src/main/java/net/minecraft/client/renderer/block/model/ModelBlock.java b/src/main/java/net/minecraft/client/renderer/block/model/ModelBlock.java
index 945f049..5e0f330 100755
--- a/src/main/java/net/minecraft/client/renderer/block/model/ModelBlock.java
+++ b/src/main/java/net/minecraft/client/renderer/block/model/ModelBlock.java
@@ -1,15 +1,10 @@
 package net.minecraft.client.renderer.block.model;
 
-import java.io.Reader;
-import java.io.StringReader;
-import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
-
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/src/main/java/net/minecraft/client/renderer/block/model/ModelBlockDefinition.java b/src/main/java/net/minecraft/client/renderer/block/model/ModelBlockDefinition.java
index 90fb680..2ef74f4 100755
--- a/src/main/java/net/minecraft/client/renderer/block/model/ModelBlockDefinition.java
+++ b/src/main/java/net/minecraft/client/renderer/block/model/ModelBlockDefinition.java
@@ -1,13 +1,10 @@
 package net.minecraft.client.renderer.block.model;
 
 import java.io.Reader;
-import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
-
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -56,8 +53,8 @@ public class ModelBlockDefinition {
 	}
 
 	public ModelBlockDefinition(List<ModelBlockDefinition> parList) {
-		for (ModelBlockDefinition modelblockdefinition : parList) {
-			this.mapVariants.putAll(modelblockdefinition.mapVariants);
+		for (int i = 0, l = parList.size(); i < l; ++i) {
+			this.mapVariants.putAll(parList.get(i).mapVariants);
 		}
 
 	}
diff --git a/src/main/java/net/minecraft/client/renderer/chunk/ChunkCompileTaskGenerator.java b/src/main/java/net/minecraft/client/renderer/chunk/ChunkCompileTaskGenerator.java
index d3a2246..dab798c 100755
--- a/src/main/java/net/minecraft/client/renderer/chunk/ChunkCompileTaskGenerator.java
+++ b/src/main/java/net/minecraft/client/renderer/chunk/ChunkCompileTaskGenerator.java
@@ -81,8 +81,8 @@ public class ChunkCompileTaskGenerator {
 		this.finished = true;
 		this.status = ChunkCompileTaskGenerator.Status.DONE;
 
-		for (Runnable runnable : this.listFinishRunnables) {
-			runnable.run();
+		for (int i = 0, l = this.listFinishRunnables.size(); i < l; ++i) {
+			this.listFinishRunnables.get(i).run();
 		}
 	}
 
diff --git a/src/main/java/net/minecraft/client/renderer/chunk/ChunkRenderWorker.java b/src/main/java/net/minecraft/client/renderer/chunk/ChunkRenderWorker.java
index 6ccc6ae..35c912b 100755
--- a/src/main/java/net/minecraft/client/renderer/chunk/ChunkRenderWorker.java
+++ b/src/main/java/net/minecraft/client/renderer/chunk/ChunkRenderWorker.java
@@ -85,7 +85,9 @@ public class ChunkRenderWorker {
 
 			final CompiledChunk compiledchunk = generator.getCompiledChunk();
 			if (chunkcompiletaskgenerator$type == ChunkCompileTaskGenerator.Type.REBUILD_CHUNK) {
-				for (EnumWorldBlockLayer enumworldblocklayer : EnumWorldBlockLayer.values()) {
+				EnumWorldBlockLayer[] layers = EnumWorldBlockLayer._VALUES;
+				for (int i = 0; i < layers.length; ++i) {
+					EnumWorldBlockLayer enumworldblocklayer = layers[i];
 					if (!compiledchunk.isLayerEmpty(enumworldblocklayer)) {
 						this.chunkRenderDispatcher.uploadChunk(enumworldblocklayer,
 								generator.getRegionRenderCacheBuilder().getWorldRendererByLayer(enumworldblocklayer),
diff --git a/src/main/java/net/minecraft/client/renderer/chunk/CompiledChunk.java b/src/main/java/net/minecraft/client/renderer/chunk/CompiledChunk.java
index 7b185fa..552200d 100755
--- a/src/main/java/net/minecraft/client/renderer/chunk/CompiledChunk.java
+++ b/src/main/java/net/minecraft/client/renderer/chunk/CompiledChunk.java
@@ -43,8 +43,8 @@ public class CompiledChunk {
 			return true;
 		}
 	};
-	private final boolean[] layersUsed = new boolean[EnumWorldBlockLayer.values().length];
-	private final boolean[] layersStarted = new boolean[EnumWorldBlockLayer.values().length];
+	private final boolean[] layersUsed = new boolean[EnumWorldBlockLayer._VALUES.length];
+	private final boolean[] layersStarted = new boolean[EnumWorldBlockLayer._VALUES.length];
 	private boolean empty = true;
 	private final List<TileEntity> tileEntities = Lists.newArrayList();
 	private SetVisibility setVisibility = new SetVisibility();
diff --git a/src/main/java/net/minecraft/client/renderer/chunk/ListedRenderChunk.java b/src/main/java/net/minecraft/client/renderer/chunk/ListedRenderChunk.java
index e188f6e..7c85cd3 100755
--- a/src/main/java/net/minecraft/client/renderer/chunk/ListedRenderChunk.java
+++ b/src/main/java/net/minecraft/client/renderer/chunk/ListedRenderChunk.java
@@ -32,7 +32,7 @@ public class ListedRenderChunk extends RenderChunk {
 
 	public ListedRenderChunk(World worldIn, RenderGlobal renderGlobalIn, BlockPos pos, int indexIn) {
 		super(worldIn, renderGlobalIn, pos, indexIn);
-		this.baseDisplayList = new int[EnumWorldBlockLayer.values().length];
+		this.baseDisplayList = new int[EnumWorldBlockLayer._VALUES.length];
 		for (int i = 0; i < this.baseDisplayList.length; ++i) {
 			this.baseDisplayList[i] = GLAllocation.generateDisplayLists();
 		}
@@ -51,7 +51,7 @@ public class ListedRenderChunk extends RenderChunk {
 
 	public void rebuildChunk(float x, float y, float z, ChunkCompileTaskGenerator generator) {
 		super.rebuildChunk(x, y, z, generator);
-		EnumWorldBlockLayer[] layers = EnumWorldBlockLayer.values();
+		EnumWorldBlockLayer[] layers = EnumWorldBlockLayer._VALUES;
 		for (int i = 0; i < layers.length; ++i) {
 			if (generator.getCompiledChunk().isLayerEmpty(layers[i])) {
 				EaglercraftGPU.flushDisplayList(this.baseDisplayList[i]);
diff --git a/src/main/java/net/minecraft/client/renderer/chunk/RenderChunk.java b/src/main/java/net/minecraft/client/renderer/chunk/RenderChunk.java
index 997392c..7c31cc4 100755
--- a/src/main/java/net/minecraft/client/renderer/chunk/RenderChunk.java
+++ b/src/main/java/net/minecraft/client/renderer/chunk/RenderChunk.java
@@ -2,7 +2,6 @@ package net.minecraft.client.renderer.chunk;
 
 import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
 
-import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
 import java.util.EnumMap;
 import java.util.HashSet;
 import java.util.Set;
@@ -99,8 +98,9 @@ public class RenderChunk {
 		this.position = pos;
 		this.boundingBox = new AxisAlignedBB(pos, pos.add(16, 16, 16));
 
-		for (EnumFacing enumfacing : EnumFacing.values()) {
-			this.field_181702_p.put(enumfacing, pos.offset(enumfacing, 16));
+		EnumFacing[] facings = EnumFacing._VALUES;
+		for (int i = 0; i < facings.length; ++i) {
+			this.field_181702_p.put(facings[i], pos.offset(facings[i], 16));
 		}
 
 		this.initModelviewMatrix();
@@ -147,7 +147,7 @@ public class RenderChunk {
 		HashSet hashset = Sets.newHashSet();
 		if (!regionrendercache.extendedLevelsInChunkCache()) {
 			++renderChunksUpdated;
-			boolean[] aboolean = new boolean[EnumWorldBlockLayer.values().length];
+			boolean[] aboolean = new boolean[EnumWorldBlockLayer._VALUES.length];
 			BlockRendererDispatcher blockrendererdispatcher = Minecraft.getMinecraft().getBlockRendererDispatcher();
 
 			for (BlockPos blockpos$mutableblockpos : BlockPos.getAllInBox(blockpos, blockpos1)) {
@@ -196,7 +196,9 @@ public class RenderChunk {
 				}
 			}
 
-			for (EnumWorldBlockLayer enumworldblocklayer : EnumWorldBlockLayer.values()) {
+			EnumWorldBlockLayer[] layers = EnumWorldBlockLayer._VALUES;
+			for (int i = 0; i < layers.length; ++i) {
+				EnumWorldBlockLayer enumworldblocklayer = layers[i];
 				if (aboolean[enumworldblocklayer.ordinal()]) {
 					compiledchunk.setLayerUsed(enumworldblocklayer);
 				}
diff --git a/src/main/java/net/minecraft/client/renderer/chunk/SetVisibility.java b/src/main/java/net/minecraft/client/renderer/chunk/SetVisibility.java
index a483bf1..b6a0f00 100755
--- a/src/main/java/net/minecraft/client/renderer/chunk/SetVisibility.java
+++ b/src/main/java/net/minecraft/client/renderer/chunk/SetVisibility.java
@@ -26,7 +26,7 @@ import net.minecraft.util.EnumFacing;
  * 
  */
 public class SetVisibility {
-	private static final int COUNT_FACES = EnumFacing.values().length;
+	private static final int COUNT_FACES = EnumFacing._VALUES.length;
 	private final BitSet bitSet;
 
 	public SetVisibility() {
@@ -34,9 +34,10 @@ public class SetVisibility {
 	}
 
 	public void setManyVisible(Set<EnumFacing> parSet) {
-		for (EnumFacing enumfacing : parSet) {
-			for (EnumFacing enumfacing1 : parSet) {
-				this.setVisible(enumfacing, enumfacing1, true);
+		EnumFacing[] facings = EnumFacing._VALUES;
+		for (int i = 0; i < facings.length; ++i) {
+			for (int j = 0; j < facings.length; ++j) {
+				this.setVisible(facings[i], facings[j], true);
 			}
 		}
 
@@ -59,20 +60,22 @@ public class SetVisibility {
 		StringBuilder stringbuilder = new StringBuilder();
 		stringbuilder.append(' ');
 
-		for (EnumFacing enumfacing : EnumFacing.values()) {
-			stringbuilder.append(' ').append(enumfacing.toString().toUpperCase().charAt(0));
+		EnumFacing[] facings = EnumFacing._VALUES;
+		for (int i = 0; i < facings.length; ++i) {
+			stringbuilder.append(' ').append(facings[i].toString().toUpperCase().charAt(0));
 		}
 
 		stringbuilder.append('\n');
 
-		for (EnumFacing enumfacing2 : EnumFacing.values()) {
+		for (int i = 0; i < facings.length; ++i) {
+			EnumFacing enumfacing2 = facings[i];
 			stringbuilder.append(enumfacing2.toString().toUpperCase().charAt(0));
 
-			for (EnumFacing enumfacing1 : EnumFacing.values()) {
-				if (enumfacing2 == enumfacing1) {
+			for (int j = 0; j < facings.length; ++j) {
+				if (enumfacing2 == facings[j]) {
 					stringbuilder.append("  ");
 				} else {
-					boolean flag = this.isVisible(enumfacing2, enumfacing1);
+					boolean flag = this.isVisible(enumfacing2, facings[j]);
 					stringbuilder.append(' ').append((char) (flag ? 'Y' : 'n'));
 				}
 			}
diff --git a/src/main/java/net/minecraft/client/renderer/chunk/VisGraph.java b/src/main/java/net/minecraft/client/renderer/chunk/VisGraph.java
index 5f8b7ce..a65bad5 100755
--- a/src/main/java/net/minecraft/client/renderer/chunk/VisGraph.java
+++ b/src/main/java/net/minecraft/client/renderer/chunk/VisGraph.java
@@ -59,9 +59,9 @@ public class VisGraph {
 		} else if (this.field_178611_f == 0) {
 			setvisibility.setAllVisible(false);
 		} else {
-			for (int i : field_178613_e) {
-				if (!this.field_178612_d.get(i)) {
-					setvisibility.setManyVisible(this.func_178604_a(i));
+			for (int i = 0; i < field_178613_e.length; ++i) {
+				if (!this.field_178612_d.get(field_178613_e[i])) {
+					setvisibility.setManyVisible(this.func_178604_a(field_178613_e[i]));
 				}
 			}
 		}
@@ -83,7 +83,9 @@ public class VisGraph {
 			int i = ((Integer) linkedlist.poll()).intValue();
 			this.func_178610_a(i, enumset);
 
-			for (EnumFacing enumfacing : EnumFacing.values()) {
+			EnumFacing[] facings = EnumFacing._VALUES;
+			for (int k = 0; k < facings.length; ++k) {
+				EnumFacing enumfacing = facings[k];
 				int j = this.func_178603_a(i, enumfacing);
 				if (j >= 0 && !this.field_178612_d.get(j)) {
 					this.field_178612_d.set(j, true);
diff --git a/src/main/java/net/minecraft/client/renderer/culling/ClippingHelperImpl.java b/src/main/java/net/minecraft/client/renderer/culling/ClippingHelperImpl.java
index 4a6adde..869ed42 100755
--- a/src/main/java/net/minecraft/client/renderer/culling/ClippingHelperImpl.java
+++ b/src/main/java/net/minecraft/client/renderer/culling/ClippingHelperImpl.java
@@ -2,11 +2,7 @@ package net.minecraft.client.renderer.culling;
 
 import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*;
 
-import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
-
-import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
-import net.minecraft.client.renderer.GLAllocation;
 import net.minecraft.util.MathHelper;
 
 /**+
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderCreeper.java b/src/main/java/net/minecraft/client/renderer/entity/RenderCreeper.java
index 9011066..80b52ad 100755
--- a/src/main/java/net/minecraft/client/renderer/entity/RenderCreeper.java
+++ b/src/main/java/net/minecraft/client/renderer/entity/RenderCreeper.java
@@ -2,10 +2,8 @@ package net.minecraft.client.renderer.entity;
 
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DeferredStateManager;
-import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DynamicLightManager;
 import net.minecraft.client.model.ModelCreeper;
 import net.minecraft.client.renderer.entity.layers.LayerCreeperCharge;
-import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
 import net.minecraft.entity.monster.EntityCreeper;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.ResourceLocation;
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderEntityItem.java b/src/main/java/net/minecraft/client/renderer/entity/RenderEntityItem.java
index 3b6a379..4cf405d 100755
--- a/src/main/java/net/minecraft/client/renderer/entity/RenderEntityItem.java
+++ b/src/main/java/net/minecraft/client/renderer/entity/RenderEntityItem.java
@@ -6,7 +6,6 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DeferredStateManager;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.resources.model.IBakedModel;
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderItem.java b/src/main/java/net/minecraft/client/renderer/entity/RenderItem.java
index 16040e5..715a8d0 100755
--- a/src/main/java/net/minecraft/client/renderer/entity/RenderItem.java
+++ b/src/main/java/net/minecraft/client/renderer/entity/RenderItem.java
@@ -10,7 +10,6 @@ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DeferredStateManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.EaglerDeferredPipeline;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.ShadersRenderPassFuture;
-import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.ShadersRenderPassFuture.PassType;
 import net.lax1dude.eaglercraft.v1_8.vector.Matrix4f;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockDirt;
@@ -139,7 +138,9 @@ public class RenderItem implements IResourceManagerReloadListener {
 		WorldRenderer worldrenderer = tessellator.getWorldRenderer();
 		worldrenderer.begin(7, DefaultVertexFormats.ITEM);
 
-		for (EnumFacing enumfacing : EnumFacing.values()) {
+		EnumFacing[] facings = EnumFacing._VALUES;
+		for (int i = 0; i < facings.length; ++i) {
+			EnumFacing enumfacing = facings[i];
 			this.renderQuads(worldrenderer, model.getFaceQuads(enumfacing), color, stack);
 		}
 
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RenderLightningBolt.java b/src/main/java/net/minecraft/client/renderer/entity/RenderLightningBolt.java
index 2d81247..ad44405 100755
--- a/src/main/java/net/minecraft/client/renderer/entity/RenderLightningBolt.java
+++ b/src/main/java/net/minecraft/client/renderer/entity/RenderLightningBolt.java
@@ -7,7 +7,6 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DeferredStateManager;
-import net.lax1dude.eaglercraft.v1_8.vector.Matrix4f;
 import net.minecraft.client.renderer.EntityRenderer;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
diff --git a/src/main/java/net/minecraft/client/renderer/entity/RendererLivingEntity.java b/src/main/java/net/minecraft/client/renderer/entity/RendererLivingEntity.java
index 94fc020..678383c 100755
--- a/src/main/java/net/minecraft/client/renderer/entity/RendererLivingEntity.java
+++ b/src/main/java/net/minecraft/client/renderer/entity/RendererLivingEntity.java
@@ -411,7 +411,8 @@ public abstract class RendererLivingEntity<T extends EntityLivingBase> extends R
 
 	protected void renderLayers(T entitylivingbaseIn, float partialTicks, float parFloat2, float parFloat3,
 			float parFloat4, float parFloat5, float parFloat6, float parFloat7) {
-		for (LayerRenderer layerrenderer : this.layerRenderers) {
+		for (int i = 0, l = this.layerRenderers.size(); i < l; ++i) {
+			LayerRenderer layerrenderer = this.layerRenderers.get(i);
 			boolean flag = this.setBrightness(entitylivingbaseIn, parFloat3, layerrenderer.shouldCombineTextures());
 			layerrenderer.doRenderLayer(entitylivingbaseIn, partialTicks, parFloat2, parFloat3, parFloat4, parFloat5,
 					parFloat6, parFloat7);
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerArrow.java b/src/main/java/net/minecraft/client/renderer/entity/layers/LayerArrow.java
index 246dae9..a6c4866 100755
--- a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerArrow.java
+++ b/src/main/java/net/minecraft/client/renderer/entity/layers/LayerArrow.java
@@ -5,7 +5,6 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.minecraft.client.model.ModelBox;
 import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.entity.RendererLivingEntity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.projectile.EntityArrow;
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerCreeperCharge.java b/src/main/java/net/minecraft/client/renderer/entity/layers/LayerCreeperCharge.java
index db8f793..52e1510 100755
--- a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerCreeperCharge.java
+++ b/src/main/java/net/minecraft/client/renderer/entity/layers/LayerCreeperCharge.java
@@ -9,7 +9,6 @@ import net.lax1dude.eaglercraft.v1_8.vector.Matrix4f;
 import net.minecraft.client.model.ModelCreeper;
 import net.minecraft.client.renderer.EntityRenderer;
 import net.minecraft.client.renderer.entity.RenderCreeper;
-import net.minecraft.client.renderer.entity.RendererLivingEntity;
 import net.minecraft.entity.monster.EntityCreeper;
 import net.minecraft.util.ResourceLocation;
 
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerSheepWool.java b/src/main/java/net/minecraft/client/renderer/entity/layers/LayerSheepWool.java
index 147f097..825c189 100755
--- a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerSheepWool.java
+++ b/src/main/java/net/minecraft/client/renderer/entity/layers/LayerSheepWool.java
@@ -43,7 +43,7 @@ public class LayerSheepWool implements LayerRenderer<EntitySheep> {
 			if (entitysheep.hasCustomName() && "jeb_".equals(entitysheep.getCustomNameTag())) {
 				boolean flag = true;
 				int i = entitysheep.ticksExisted / 25 + entitysheep.getEntityId();
-				int j = EnumDyeColor.values().length;
+				int j = EnumDyeColor.META_LOOKUP.length;
 				int k = i % j;
 				int l = (i + 1) % j;
 				float f7 = ((float) (entitysheep.ticksExisted % 25) + f2) / 25.0F;
diff --git a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerSlimeGel.java b/src/main/java/net/minecraft/client/renderer/entity/layers/LayerSlimeGel.java
index 6c98c1a..0bb0646 100755
--- a/src/main/java/net/minecraft/client/renderer/entity/layers/LayerSlimeGel.java
+++ b/src/main/java/net/minecraft/client/renderer/entity/layers/LayerSlimeGel.java
@@ -11,9 +11,7 @@ import net.minecraft.client.model.ModelSlime;
 import net.minecraft.client.renderer.EntityRenderer;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.entity.RenderSlime;
-import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
 import net.minecraft.entity.monster.EntitySlime;
-import net.minecraft.util.MathHelper;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
diff --git a/src/main/java/net/minecraft/client/renderer/texture/LayeredTexture.java b/src/main/java/net/minecraft/client/renderer/texture/LayeredTexture.java
index 66894ba..e219a5f 100755
--- a/src/main/java/net/minecraft/client/renderer/texture/LayeredTexture.java
+++ b/src/main/java/net/minecraft/client/renderer/texture/LayeredTexture.java
@@ -45,7 +45,8 @@ public class LayeredTexture extends AbstractTexture {
 		ImageData bufferedimage = null;
 
 		try {
-			for (String s : this.layeredTextureNames) {
+			for (int i = 0, l = this.layeredTextureNames.size(); i < l; ++i) {
+				String s = this.layeredTextureNames.get(i);
 				if (s != null) {
 					InputStream inputstream = parIResourceManager.getResource(new ResourceLocation(s)).getInputStream();
 					ImageData bufferedimage1 = TextureUtil.readBufferedImage(inputstream);
diff --git a/src/main/java/net/minecraft/client/renderer/texture/Stitcher.java b/src/main/java/net/minecraft/client/renderer/texture/Stitcher.java
index f8a8267..020bc49 100755
--- a/src/main/java/net/minecraft/client/renderer/texture/Stitcher.java
+++ b/src/main/java/net/minecraft/client/renderer/texture/Stitcher.java
@@ -75,7 +75,8 @@ public class Stitcher {
 				.toArray(new Stitcher.Holder[this.setStitchHolders.size()]);
 		Arrays.sort(astitcher$holder);
 
-		for (Stitcher.Holder stitcher$holder : astitcher$holder) {
+		for (int i = 0; i < astitcher$holder.length; ++i) {
+			Stitcher.Holder stitcher$holder = astitcher$holder[i];
 			if (!this.allocateSlot(stitcher$holder)) {
 				String s = HString.format("Unable to fit: %s - size: %dx%d - Maybe try a lowerresolution resourcepack?",
 						new Object[] { stitcher$holder.getAtlasSprite().getIconName(),
@@ -93,15 +94,16 @@ public class Stitcher {
 	}
 
 	public List<EaglerTextureAtlasSprite> getStichSlots() {
-		ArrayList arraylist = Lists.newArrayList();
+		ArrayList<Slot> arraylist = Lists.newArrayList();
 
-		for (Stitcher.Slot stitcher$slot : this.stitchSlots) {
-			stitcher$slot.getAllStitchSlots(arraylist);
+		for (int i = 0, l = this.stitchSlots.size(); i < l; ++i) {
+			this.stitchSlots.get(i).getAllStitchSlots(arraylist);
 		}
 
-		ArrayList arraylist1 = Lists.newArrayList();
+		ArrayList<EaglerTextureAtlasSprite> arraylist1 = Lists.newArrayList();
 
-		for (Stitcher.Slot stitcher$slot1 : (List<Stitcher.Slot>) arraylist) {
+		for (int i = 0, l = arraylist.size(); i < l; ++i) {
+			Stitcher.Slot stitcher$slot1 = arraylist.get(i);
 			Stitcher.Holder stitcher$holder = stitcher$slot1.getStitchHolder();
 			EaglerTextureAtlasSprite textureatlassprite = stitcher$holder.getAtlasSprite();
 			textureatlassprite.initSprite(this.currentWidth, this.currentHeight, stitcher$slot1.getOriginX(),
@@ -335,8 +337,8 @@ public class Stitcher {
 							}
 						}
 
-						for (Stitcher.Slot stitcher$slot : this.subSlots) {
-							if (stitcher$slot.addSlot(holderIn)) {
+						for (int m = 0, n = this.subSlots.size(); m < n; ++m) {
+							if (this.subSlots.get(m).addSlot(holderIn)) {
 								return true;
 							}
 						}
@@ -353,8 +355,8 @@ public class Stitcher {
 			if (this.holder != null) {
 				parList.add(this);
 			} else if (this.subSlots != null) {
-				for (Stitcher.Slot stitcher$slot : this.subSlots) {
-					stitcher$slot.getAllStitchSlots(parList);
+				for (int i = 0, l = this.subSlots.size(); i < l; ++i) {
+					this.subSlots.get(i).getAllStitchSlots(parList);
 				}
 			}
 
diff --git a/src/main/java/net/minecraft/client/renderer/texture/TextureManager.java b/src/main/java/net/minecraft/client/renderer/texture/TextureManager.java
index 68da325..ceded3c 100755
--- a/src/main/java/net/minecraft/client/renderer/texture/TextureManager.java
+++ b/src/main/java/net/minecraft/client/renderer/texture/TextureManager.java
@@ -143,8 +143,8 @@ public class TextureManager implements ITickable, IResourceManagerReloadListener
 	}
 
 	public void tick() {
-		for (ITickable itickable : this.listTickables) {
-			itickable.tick();
+		for (int i = 0, l = this.listTickables.size(); i < l; ++i) {
+			this.listTickables.get(i).tick();
 		}
 
 	}
diff --git a/src/main/java/net/minecraft/client/renderer/texture/TextureMap.java b/src/main/java/net/minecraft/client/renderer/texture/TextureMap.java
index d5a2977..30d95d4 100755
--- a/src/main/java/net/minecraft/client/renderer/texture/TextureMap.java
+++ b/src/main/java/net/minecraft/client/renderer/texture/TextureMap.java
@@ -447,7 +447,8 @@ public class TextureMap extends AbstractTexture implements ITickableTextureObjec
 		height = stitcher.getCurrentHeight();
 
 		List<EaglerTextureAtlasSprite> spriteList = stitcher.getStichSlots();
-		for (EaglerTextureAtlasSprite textureatlassprite2 : spriteList) {
+		for (int l = 0, m = spriteList.size(); l < m; ++l) {
+			EaglerTextureAtlasSprite textureatlassprite2 = spriteList.get(l);
 			String s = textureatlassprite2.getIconName();
 			hashmap.remove(s);
 			this.mapUploadedSprites.put(s, textureatlassprite2);
@@ -506,23 +507,24 @@ public class TextureMap extends AbstractTexture implements ITickableTextureObjec
 
 	public void updateAnimations() {
 		if (isEaglerPBRMode) {
-			for (EaglerTextureAtlasSprite textureatlassprite : this.listAnimatedSprites) {
-				textureatlassprite.updateAnimationPBR(copyColorFramebuffer, copyMaterialFramebuffer, height);
+			for (int i = 0, l = this.listAnimatedSprites.size(); i < l; ++i) {
+				this.listAnimatedSprites.get(i).updateAnimationPBR(copyColorFramebuffer, copyMaterialFramebuffer,
+						height);
 			}
 			_wglBindFramebuffer(_GL_FRAMEBUFFER, null);
 			return;
 		}
 
-		for (EaglerTextureAtlasSprite textureatlassprite : this.listAnimatedSprites) {
-			textureatlassprite.updateAnimation(copyColorFramebuffer);
+		for (int i = 0, l = this.listAnimatedSprites.size(); i < l; ++i) {
+			this.listAnimatedSprites.get(i).updateAnimation(copyColorFramebuffer);
 		}
 
 		_wglBindFramebuffer(_GL_FRAMEBUFFER, null);
 	}
 
 	private void destroyAnimationCaches() {
-		for (EaglerTextureAtlasSprite textureatlassprite : this.listAnimatedSprites) {
-			textureatlassprite.clearFramesTextureData();
+		for (int i = 0, l = this.listAnimatedSprites.size(); i < l; ++i) {
+			this.listAnimatedSprites.get(i).clearFramesTextureData();
 		}
 	}
 
diff --git a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.java b/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.java
index e33fa1f..34e1995 100755
--- a/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.java
+++ b/src/main/java/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.java
@@ -127,9 +127,9 @@ public class TileEntityBannerRenderer extends TileEntitySpecialRenderer<TileEnti
 				List list = bannerObj.getColorList();
 				ArrayList arraylist = Lists.newArrayList();
 
-				for (TileEntityBanner.EnumBannerPattern tileentitybanner$enumbannerpattern : (List<TileEntityBanner.EnumBannerPattern>) list1) {
-					arraylist.add(
-							"textures/entity/banner/" + tileentitybanner$enumbannerpattern.getPatternName() + ".png");
+				for (int i = 0, l = list1.size(); i < l; ++i) {
+					arraylist.add("textures/entity/banner/"
+							+ ((TileEntityBanner.EnumBannerPattern) list1.get(i)).getPatternName() + ".png");
 				}
 
 				tileentitybannerrenderer$timedbannertexture = new TileEntityBannerRenderer.TimedBannerTexture();
diff --git a/src/main/java/net/minecraft/client/resources/AbstractResourcePack.java b/src/main/java/net/minecraft/client/resources/AbstractResourcePack.java
index 9b4d624..2ff47ce 100755
--- a/src/main/java/net/minecraft/client/resources/AbstractResourcePack.java
+++ b/src/main/java/net/minecraft/client/resources/AbstractResourcePack.java
@@ -4,7 +4,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 
-import net.lax1dude.eaglercraft.v1_8.vfs.SYS;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -12,6 +11,7 @@ import net.lax1dude.eaglercraft.v1_8.IOUtils;
 import net.lax1dude.eaglercraft.v1_8.HString;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerFolderResourcePack;
 import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
 import net.minecraft.client.renderer.texture.TextureUtil;
 import net.minecraft.client.resources.data.IMetadataSection;
@@ -73,8 +73,8 @@ public abstract class AbstractResourcePack implements IResourcePack {
 		try {
 			return readMetadata(parIMetadataSerializer, this.getInputStreamByName("pack.mcmeta"), parString1);
 		} catch (JSONException e) {
-			if (SYS.VFS != null) {
-				SYS.deleteResourcePack(this.resourcePackFile);
+			if (this instanceof EaglerFolderResourcePack) {
+				EaglerFolderResourcePack.deleteResourcePack((EaglerFolderResourcePack) this);
 			}
 			throw e;
 		}
diff --git a/src/main/java/net/minecraft/client/resources/FallbackResourceManager.java b/src/main/java/net/minecraft/client/resources/FallbackResourceManager.java
index cedc945..2de67bd 100755
--- a/src/main/java/net/minecraft/client/resources/FallbackResourceManager.java
+++ b/src/main/java/net/minecraft/client/resources/FallbackResourceManager.java
@@ -83,7 +83,8 @@ public class FallbackResourceManager implements IResourceManager {
 		ArrayList arraylist = Lists.newArrayList();
 		ResourceLocation resourcelocation = getLocationMcmeta(location);
 
-		for (IResourcePack iresourcepack : this.resourcePacks) {
+		for (int i = 0, l = this.resourcePacks.size(); i < l; ++i) {
+			IResourcePack iresourcepack = this.resourcePacks.get(i);
 			if (iresourcepack.resourceExists(location)) {
 				InputStream inputstream = iresourcepack.resourceExists(resourcelocation)
 						? this.getInputStream(resourcelocation, iresourcepack)
diff --git a/src/main/java/net/minecraft/client/resources/LanguageManager.java b/src/main/java/net/minecraft/client/resources/LanguageManager.java
index 81ceafe..83eb33c 100755
--- a/src/main/java/net/minecraft/client/resources/LanguageManager.java
+++ b/src/main/java/net/minecraft/client/resources/LanguageManager.java
@@ -52,7 +52,8 @@ public class LanguageManager implements IResourceManagerReloadListener {
 	public void parseLanguageMetadata(List<IResourcePack> parList) {
 		this.languageMap.clear();
 
-		for (IResourcePack iresourcepack : parList) {
+		for (int i = 0, l = parList.size(); i < l; ++i) {
+			IResourcePack iresourcepack = parList.get(i);
 			try {
 				LanguageMetadataSection languagemetadatasection = (LanguageMetadataSection) iresourcepack
 						.getPackMetadata(this.theMetadataSerializer, "language");
diff --git a/src/main/java/net/minecraft/client/resources/ResourceIndex.java b/src/main/java/net/minecraft/client/resources/ResourceIndex.java
deleted file mode 100755
index 6c9da02..0000000
--- a/src/main/java/net/minecraft/client/resources/ResourceIndex.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package net.minecraft.client.resources;
-
-/**+
- * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
- * 
- * Minecraft 1.8.8 bytecode is (c) 2015 Mojang AB. "Do not distribute!"
- * Mod Coder Pack v9.18 deobfuscation configs are (c) Copyright by the MCP Team
- * 
- * EaglercraftX 1.8 patch files (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- */
-public class ResourceIndex {
-	// private static final Logger logger = LogManager.getLogger();
-	// private final Map<String, File> resourceMap = Maps.newHashMap();
-
-	// public ResourceIndex(File parFile, String parString1) {
-	/*
-	 * if (parString1 != null) { File file1 = new File(parFile, "objects"); File
-	 * file2 = new File(parFile, "indexes/" + parString1 + ".json"); BufferedReader
-	 * bufferedreader = null;
-	 * 
-	 * try { bufferedreader = Files.newReader(file2, Charsets.UTF_8); JsonObject
-	 * jsonobject = (new JsonParser()).parse(bufferedreader).getAsJsonObject();
-	 * JsonObject jsonobject1 = JsonUtils.getJsonObject(jsonobject, "objects",
-	 * (JsonObject) null); if (jsonobject1 != null) { for (Entry entry :
-	 * jsonobject1.entrySet()) { JsonObject jsonobject2 = (JsonObject)
-	 * entry.getValue(); String s = (String) entry.getKey(); String[] astring =
-	 * s.split("/", 2); String s1 = astring.length == 1 ? astring[0] : astring[0] +
-	 * ":" + astring[1]; String s2 = JsonUtils.getString(jsonobject2, "hash"); File
-	 * file3 = new File(file1, s2.substring(0, 2) + "/" + s2);
-	 * this.resourceMap.put(s1, file3); } } } catch (JsonParseException var20) {
-	 * logger.error("Unable to parse resource index file: " + file2); } catch
-	 * (FileNotFoundException var21) {
-	 * logger.error("Can\'t find the resource index file: " + file2); } finally {
-	 * IOUtils.closeQuietly(bufferedreader); }
-	 * 
-	 * }
-	 */
-	// }
-
-	// public Map<String, File> getResourceMap() {
-	// return this.resourceMap;
-	// }
-}
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/resources/ResourcePackListEntry.java b/src/main/java/net/minecraft/client/resources/ResourcePackListEntry.java
index ffb4197..eff87f6 100755
--- a/src/main/java/net/minecraft/client/resources/ResourcePackListEntry.java
+++ b/src/main/java/net/minecraft/client/resources/ResourcePackListEntry.java
@@ -3,8 +3,8 @@ package net.minecraft.client.resources;
 import java.util.List;
 
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
-import net.lax1dude.eaglercraft.v1_8.vfs.SYS;
 import net.lax1dude.eaglercraft.v1_8.internal.KeyboardConstants;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerFolderResourcePack;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
@@ -182,7 +182,8 @@ public abstract class ResourcePackListEntry implements GuiListExtended.IGuiListE
 			this.resourcePacksGUI.getListContaining(this).remove(this);
 			if (deleteInstead) {
 				this.mc.loadingScreen.eaglerShow(I18n.format("resourcePack.load.deleting"), this.func_148312_b());
-				SYS.deleteResourcePack(this.func_148312_b());
+				EaglerFolderResourcePack.deleteResourcePack(EaglerFolderResourcePack.RESOURCE_PACKS,
+						this.func_148312_b());
 			} else {
 				this.resourcePacksGUI.getSelectedResourcePacks().add(0, this);
 			}
diff --git a/src/main/java/net/minecraft/client/resources/ResourcePackListEntryFound.java b/src/main/java/net/minecraft/client/resources/ResourcePackListEntryFound.java
index fbf35d3..177d862 100755
--- a/src/main/java/net/minecraft/client/resources/ResourcePackListEntryFound.java
+++ b/src/main/java/net/minecraft/client/resources/ResourcePackListEntryFound.java
@@ -44,7 +44,7 @@ public class ResourcePackListEntryFound extends ResourcePackListEntry {
 	}
 
 	protected String func_148312_b() {
-		return this.field_148319_c.getResourcePackName();
+		return this.field_148319_c.getResourcePackEaglerDisplayName();
 	}
 
 	public ResourcePackRepository.Entry func_148318_i() {
diff --git a/src/main/java/net/minecraft/client/resources/ResourcePackRepository.java b/src/main/java/net/minecraft/client/resources/ResourcePackRepository.java
index b25a707..18c393e 100755
--- a/src/main/java/net/minecraft/client/resources/ResourcePackRepository.java
+++ b/src/main/java/net/minecraft/client/resources/ResourcePackRepository.java
@@ -10,11 +10,10 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 
 import net.lax1dude.eaglercraft.v1_8.IOUtils;
-import net.lax1dude.eaglercraft.v1_8.vfs.FolderResourcePack;
-import net.lax1dude.eaglercraft.v1_8.vfs.SYS;
 import net.lax1dude.eaglercraft.v1_8.futures.ListenableFuture;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerFolderResourcePack;
 import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.DynamicTexture;
@@ -58,13 +57,20 @@ public class ResourcePackRepository {
 			GameSettings settings) {
 		this.rprDefaultResourcePack = rprDefaultResourcePackIn;
 		this.rprMetadataSerializer = rprMetadataSerializerIn;
+		reconstruct(settings);
+	}
+
+	public void reconstruct(GameSettings settings) {
+		this.repositoryEntriesAll.clear();
+		this.repositoryEntries.clear();
 		this.updateRepositoryEntriesAll();
 		Iterator iterator = settings.resourcePacks.iterator();
 
 		while (iterator.hasNext()) {
 			String s = (String) iterator.next();
 
-			for (ResourcePackRepository.Entry resourcepackrepository$entry : this.repositoryEntriesAll) {
+			for (int i = 0, l = this.repositoryEntriesAll.size(); i < l; ++i) {
+				ResourcePackRepository.Entry resourcepackrepository$entry = this.repositoryEntriesAll.get(i);
 				if (resourcepackrepository$entry.getResourcePackName().equals(s)) {
 					if (resourcepackrepository$entry.func_183027_f() == 1
 							|| settings.field_183018_l.contains(resourcepackrepository$entry.getResourcePackName())) {
@@ -82,13 +88,12 @@ public class ResourcePackRepository {
 	}
 
 	public void updateRepositoryEntriesAll() {
-		if (SYS.VFS == null)
-			return;
-
 		List<ResourcePackRepository.Entry> list = Lists.<ResourcePackRepository.Entry>newArrayList();
 
-		for (String file1 : SYS.getResourcePackNames()) {
-			ResourcePackRepository.Entry resourcepackrepository$entry = new ResourcePackRepository.Entry(file1);
+		List<EaglerFolderResourcePack> list2 = EaglerFolderResourcePack
+				.getFolderResourcePacks(EaglerFolderResourcePack.RESOURCE_PACKS);
+		for (int j = 0, l = list2.size(); j < l; ++j) {
+			ResourcePackRepository.Entry resourcepackrepository$entry = new ResourcePackRepository.Entry(list2.get(j));
 
 			if (!this.repositoryEntriesAll.contains(resourcepackrepository$entry)) {
 				try {
@@ -96,7 +101,7 @@ public class ResourcePackRepository {
 					list.add(resourcepackrepository$entry);
 				} catch (Exception var6) {
 					logger.error("Failed to call \"updateResourcePack\" for resource pack \"{}\"",
-							resourcepackrepository$entry.resourcePackFile);
+							resourcepackrepository$entry.reResourcePack.resourcePackFile);
 					logger.error(var6);
 					list.remove(resourcepackrepository$entry);
 				}
@@ -111,8 +116,8 @@ public class ResourcePackRepository {
 
 		this.repositoryEntriesAll.removeAll(list);
 
-		for (ResourcePackRepository.Entry resourcepackrepository$entry1 : this.repositoryEntriesAll) {
-			resourcepackrepository$entry1.closeResourcePack();
+		for (int i = 0, l = this.repositoryEntriesAll.size(); i < l; ++i) {
+			this.repositoryEntriesAll.get(i).closeResourcePack();
 		}
 
 		this.repositoryEntriesAll = list;
@@ -132,9 +137,9 @@ public class ResourcePackRepository {
 	}
 
 	public void downloadResourcePack(String s1, String s2, Consumer<Boolean> cb) {
-		SYS.loadRemoteResourcePack(s1, s2, res -> {
+		EaglerFolderResourcePack.loadRemoteResourcePack(s1, s2, res -> {
 			if (res != null) {
-				ResourcePackRepository.this.resourcePackInstance = new FolderResourcePack(res, "srp/");
+				ResourcePackRepository.this.resourcePackInstance = res;
 				Minecraft.getMinecraft().scheduleResourcesRefresh();
 				cb.accept(true);
 				return;
@@ -164,28 +169,24 @@ public class ResourcePackRepository {
 	}
 
 	public class Entry {
-		private final String resourcePackFile;
-		private IResourcePack reResourcePack;
+		private EaglerFolderResourcePack reResourcePack;
 		private PackMetadataSection rePackMetadataSection;
 		private ImageData texturePackIcon;
 		private ResourceLocation locationTexturePackIcon;
 		private TextureManager iconTextureManager;
 
-		private Entry(String resourcePackFileIn) {
-			this.resourcePackFile = resourcePackFileIn;
+		private Entry(EaglerFolderResourcePack resourcePackFileIn) {
+			this.reResourcePack = resourcePackFileIn;
 		}
 
 		public void updateResourcePack() throws IOException {
-			if (SYS.VFS == null)
-				return;
-			this.reResourcePack = (IResourcePack) new FolderResourcePack(this.resourcePackFile, "resourcepacks/");
 			this.rePackMetadataSection = (PackMetadataSection) this.reResourcePack
 					.getPackMetadata(ResourcePackRepository.this.rprMetadataSerializer, "pack");
 
 			try {
 				this.texturePackIcon = this.reResourcePack.getPackImage();
 			} catch (IOException var2) {
-				logger.error("Failed to load resource pack icon for \"{}\"!", resourcePackFile);
+				logger.error("Failed to load resource pack icon for \"{}\"!", reResourcePack.resourcePackFile);
 				logger.error(var2);
 			}
 
@@ -225,6 +226,10 @@ public class ResourcePackRepository {
 			return this.reResourcePack.getPackName();
 		}
 
+		public String getResourcePackEaglerDisplayName() {
+			return this.reResourcePack.getDisplayName();
+		}
+
 		public String getTexturePackDescription() {
 			return this.rePackMetadataSection == null
 					? EnumChatFormatting.RED + "Invalid pack.mcmeta (or missing \'pack\' section)"
@@ -246,7 +251,7 @@ public class ResourcePackRepository {
 		}
 
 		public String toString() {
-			return this.resourcePackFile;
+			return this.reResourcePack.resourcePackFile;
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/client/resources/data/AnimationMetadataSection.java b/src/main/java/net/minecraft/client/resources/data/AnimationMetadataSection.java
index 51681b2..cfddc0a 100755
--- a/src/main/java/net/minecraft/client/resources/data/AnimationMetadataSection.java
+++ b/src/main/java/net/minecraft/client/resources/data/AnimationMetadataSection.java
@@ -82,8 +82,8 @@ public class AnimationMetadataSection implements IMetadataSection {
 	public Set<Integer> getFrameIndexSet() {
 		HashSet hashset = Sets.newHashSet();
 
-		for (AnimationFrame animationframe : this.animationFrames) {
-			hashset.add(Integer.valueOf(animationframe.getFrameIndex()));
+		for (int i = 0, l = this.animationFrames.size(); i < l; ++i) {
+			hashset.add(Integer.valueOf(this.animationFrames.get(i).getFrameIndex()));
 		}
 
 		return hashset;
diff --git a/src/main/java/net/minecraft/client/resources/model/ModelBakery.java b/src/main/java/net/minecraft/client/resources/model/ModelBakery.java
index c0d56f6..7c4e619 100755
--- a/src/main/java/net/minecraft/client/resources/model/ModelBakery.java
+++ b/src/main/java/net/minecraft/client/resources/model/ModelBakery.java
@@ -26,7 +26,6 @@ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.BlockVertexIDs;
-import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DeferredStateManager;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.VertexMarkerState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BlockModelShapes;
diff --git a/src/main/java/net/minecraft/client/resources/model/ModelRotation.java b/src/main/java/net/minecraft/client/resources/model/ModelRotation.java
index 52cb88a..7942535 100755
--- a/src/main/java/net/minecraft/client/resources/model/ModelRotation.java
+++ b/src/main/java/net/minecraft/client/resources/model/ModelRotation.java
@@ -103,8 +103,9 @@ public enum ModelRotation {
 	}
 
 	static {
-		for (ModelRotation modelrotation : values()) {
-			mapRotations.put(Integer.valueOf(modelrotation.combinedXY), modelrotation);
+		ModelRotation[] lst = values();
+		for (int i = 0; i < lst.length; ++i) {
+			mapRotations.put(Integer.valueOf(lst[i].combinedXY), lst[i]);
 		}
 
 	}
diff --git a/src/main/java/net/minecraft/client/resources/model/SimpleBakedModel.java b/src/main/java/net/minecraft/client/resources/model/SimpleBakedModel.java
index a1bc503..f1dafc2 100755
--- a/src/main/java/net/minecraft/client/resources/model/SimpleBakedModel.java
+++ b/src/main/java/net/minecraft/client/resources/model/SimpleBakedModel.java
@@ -94,8 +94,9 @@ public class SimpleBakedModel implements IBakedModel {
 					parIBakedModel.getItemCameraTransforms());
 			this.builderTexture = parIBakedModel.getParticleTexture();
 
-			for (EnumFacing enumfacing : EnumFacing.values()) {
-				this.addFaceBreakingFours(parIBakedModel, parTextureAtlasSprite, enumfacing);
+			EnumFacing[] facings = EnumFacing._VALUES;
+			for (int i = 0; i < facings.length; ++i) {
+				this.addFaceBreakingFours(parIBakedModel, parTextureAtlasSprite, facings[i]);
 			}
 
 			this.addGeneralBreakingFours(parIBakedModel, parTextureAtlasSprite);
@@ -103,16 +104,18 @@ public class SimpleBakedModel implements IBakedModel {
 
 		private void addFaceBreakingFours(IBakedModel parIBakedModel, EaglerTextureAtlasSprite parTextureAtlasSprite,
 				EnumFacing parEnumFacing) {
-			for (BakedQuad bakedquad : parIBakedModel.getFaceQuads(parEnumFacing)) {
-				this.addFaceQuad(parEnumFacing, new BreakingFour(bakedquad, parTextureAtlasSprite));
+			List<BakedQuad> quads = parIBakedModel.getFaceQuads(parEnumFacing);
+			for (int i = 0, l = quads.size(); i < l; ++i) {
+				this.addFaceQuad(parEnumFacing, new BreakingFour(quads.get(i), parTextureAtlasSprite));
 			}
 
 		}
 
 		private void addGeneralBreakingFours(IBakedModel parIBakedModel,
 				EaglerTextureAtlasSprite parTextureAtlasSprite) {
-			for (BakedQuad bakedquad : parIBakedModel.getGeneralQuads()) {
-				this.addGeneralQuad(new BreakingFour(bakedquad, parTextureAtlasSprite));
+			List<BakedQuad> quads = parIBakedModel.getGeneralQuads();
+			for (int i = 0, l = quads.size(); i < l; ++i) {
+				this.addGeneralQuad(new BreakingFour(quads.get(i), parTextureAtlasSprite));
 			}
 
 		}
@@ -121,7 +124,7 @@ public class SimpleBakedModel implements IBakedModel {
 			this.builderGeneralQuads = Lists.newArrayList();
 			this.builderFaceQuads = Lists.newArrayListWithCapacity(6);
 
-			for (EnumFacing enumfacing : EnumFacing.values()) {
+			for (int i = 0, l = EnumFacing._VALUES.length; i < l; ++i) {
 				this.builderFaceQuads.add(Lists.newArrayList());
 			}
 
diff --git a/src/main/java/net/minecraft/client/resources/model/WeightedBakedModel.java b/src/main/java/net/minecraft/client/resources/model/WeightedBakedModel.java
index 227b920..d90772a 100755
--- a/src/main/java/net/minecraft/client/resources/model/WeightedBakedModel.java
+++ b/src/main/java/net/minecraft/client/resources/model/WeightedBakedModel.java
@@ -111,8 +111,9 @@ public class WeightedBakedModel implements IBakedModel {
 		protected int getCountQuads() {
 			int i = this.model.getGeneralQuads().size();
 
-			for (EnumFacing enumfacing : EnumFacing.values()) {
-				i += this.model.getFaceQuads(enumfacing).size();
+			EnumFacing[] facings = EnumFacing._VALUES;
+			for (int j = 0; j < facings.length; ++j) {
+				i += this.model.getFaceQuads(facings[j]).size();
 			}
 
 			return i;
diff --git a/src/main/java/net/minecraft/client/settings/GameSettings.java b/src/main/java/net/minecraft/client/settings/GameSettings.java
index 322d7a2..0aa4b43 100755
--- a/src/main/java/net/minecraft/client/settings/GameSettings.java
+++ b/src/main/java/net/minecraft/client/settings/GameSettings.java
@@ -1,7 +1,6 @@
 package net.minecraft.client.settings;
 
 import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
@@ -10,8 +9,6 @@ import java.util.Map;
 import java.util.Set;
 
 import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayManager;
-import net.minecraft.nbt.CompressedStreamTools;
-import net.minecraft.nbt.NBTTagCompound;
 import org.json.JSONArray;
 
 import com.google.common.collect.ImmutableSet;
@@ -22,6 +19,7 @@ import com.google.common.collect.Sets;
 import net.lax1dude.eaglercraft.v1_8.ArrayUtils;
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
+import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
 import net.lax1dude.eaglercraft.v1_8.EaglerZLIB;
 import net.lax1dude.eaglercraft.v1_8.HString;
 import net.lax1dude.eaglercraft.v1_8.Keyboard;
@@ -116,7 +114,7 @@ public class GameSettings {
 	 * Whether to pause when the game loses focus, toggled by F3+P
 	 */
 	public boolean pauseOnLostFocus = true;
-	private final Set<EnumPlayerModelParts> setModelParts = Sets.newHashSet(EnumPlayerModelParts.values());
+	private final Set<EnumPlayerModelParts> setModelParts = Sets.newHashSet(EnumPlayerModelParts._VALUES);
 	public boolean touchscreen;
 	public int overrideWidth;
 	public int overrideHeight;
@@ -641,14 +639,21 @@ public class GameSettings {
 	 * has replaced the previous 'loadOptions'
 	 */
 	public void loadOptions() {
-		try {
-			byte[] options = EagRuntime.getStorage("g");
-			if (options == null) {
-				return;
-			}
+		byte[] options = EagRuntime.getStorage("g");
+		if (options == null) {
+			return;
+		}
+		loadOptions(options);
+	}
 
+	/**+
+	 * Loads the options from the options file. It appears that this
+	 * has replaced the previous 'loadOptions'
+	 */
+	public void loadOptions(byte[] data) {
+		try {
 			BufferedReader bufferedreader = new BufferedReader(
-					new InputStreamReader(EaglerZLIB.newGZIPInputStream(new EaglerInputStream(options))));
+					new InputStreamReader(EaglerZLIB.newGZIPInputStream(new EaglerInputStream(data))));
 			String s = "";
 			this.mapSoundLevels.clear();
 
@@ -929,13 +934,13 @@ public class GameSettings {
 
 					Keyboard.setFunctionKeyModifier(keyBindFunction.getKeyCode());
 
-					for (SoundCategory soundcategory : SoundCategory.values()) {
+					for (SoundCategory soundcategory : SoundCategory._VALUES) {
 						if (astring[0].equals("soundCategory_" + soundcategory.getCategoryName())) {
 							this.mapSoundLevels.put(soundcategory, Float.valueOf(this.parseFloat(astring[1])));
 						}
 					}
 
-					for (EnumPlayerModelParts enumplayermodelparts : EnumPlayerModelParts.values()) {
+					for (EnumPlayerModelParts enumplayermodelparts : EnumPlayerModelParts._VALUES) {
 						if (astring[0].equals("modelPart_" + enumplayermodelparts.getPartName())) {
 							this.setModelPartEnabled(enumplayermodelparts, astring[1].equals("true"));
 						}
@@ -965,8 +970,17 @@ public class GameSettings {
 	 * Saves the options to the options file.
 	 */
 	public void saveOptions() {
+		byte[] data = writeOptions();
+		if (data != null) {
+			EagRuntime.setStorage("g", data);
+		}
+		RelayManager.relayManager.save();
+		this.sendSettingsToServer();
+	}
+
+	public byte[] writeOptions() {
 		try {
-			ByteArrayOutputStream bao = new ByteArrayOutputStream();
+			EaglerOutputStream bao = new EaglerOutputStream();
 			PrintWriter printwriter = new PrintWriter(new OutputStreamWriter(EaglerZLIB.newGZIPOutputStream(bao)));
 			printwriter.println("invertYMouse:" + this.invertMouse);
 			printwriter.println("mouseSensitivity:" + this.mouseSensitivity);
@@ -1044,12 +1058,12 @@ public class GameSettings {
 
 			Keyboard.setFunctionKeyModifier(keyBindFunction.getKeyCode());
 
-			for (SoundCategory soundcategory : SoundCategory.values()) {
+			for (SoundCategory soundcategory : SoundCategory._VALUES) {
 				printwriter.println(
 						"soundCategory_" + soundcategory.getCategoryName() + ":" + this.getSoundLevel(soundcategory));
 			}
 
-			for (EnumPlayerModelParts enumplayermodelparts : EnumPlayerModelParts.values()) {
+			for (EnumPlayerModelParts enumplayermodelparts : EnumPlayerModelParts._VALUES) {
 				printwriter.println("modelPart_" + enumplayermodelparts.getPartName() + ":"
 						+ this.setModelParts.contains(enumplayermodelparts));
 			}
@@ -1057,15 +1071,12 @@ public class GameSettings {
 			deferredShaderConf.writeOptions(printwriter);
 
 			printwriter.close();
-
-			EagRuntime.setStorage("g", bao.toByteArray());
-
-			RelayManager.relayManager.save();
+			return bao.toByteArray();
 		} catch (Exception exception) {
 			logger.error("Failed to save options", exception);
+			return null;
 		}
 
-		this.sendSettingsToServer();
 	}
 
 	public float getSoundLevel(SoundCategory parSoundCategory) {
diff --git a/src/main/java/net/minecraft/client/settings/KeyBinding.java b/src/main/java/net/minecraft/client/settings/KeyBinding.java
index e307405..e4b476a 100755
--- a/src/main/java/net/minecraft/client/settings/KeyBinding.java
+++ b/src/main/java/net/minecraft/client/settings/KeyBinding.java
@@ -61,8 +61,8 @@ public class KeyBinding implements Comparable<KeyBinding> {
 	}
 
 	public static void unPressAllKeys() {
-		for (KeyBinding keybinding : keybindArray) {
-			keybinding.unpressKey();
+		for (int i = 0, l = keybindArray.size(); i < l; ++i) {
+			keybindArray.get(i).unpressKey();
 		}
 
 	}
@@ -70,7 +70,8 @@ public class KeyBinding implements Comparable<KeyBinding> {
 	public static void resetKeyBindingArrayAndHash() {
 		hash.clearMap();
 
-		for (KeyBinding keybinding : keybindArray) {
+		for (int i = 0, l = keybindArray.size(); i < l; ++i) {
+			KeyBinding keybinding = keybindArray.get(i);
 			hash.addKey(keybinding.keyCode, keybinding);
 		}
 
diff --git a/src/main/java/net/minecraft/command/CommandBase.java b/src/main/java/net/minecraft/command/CommandBase.java
index 6307467..b5667f8 100755
--- a/src/main/java/net/minecraft/command/CommandBase.java
+++ b/src/main/java/net/minecraft/command/CommandBase.java
@@ -12,14 +12,6 @@ import java.util.Collections;
 import java.util.List;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 import net.minecraft.block.Block;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.EntityNotFoundException;
-import net.minecraft.command.IAdminCommand;
-import net.minecraft.command.ICommand;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.NumberInvalidException;
-import net.minecraft.command.PlayerNotFoundException;
-import net.minecraft.command.PlayerSelector;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.Item;
diff --git a/src/main/java/net/minecraft/command/CommandBlockData.java b/src/main/java/net/minecraft/command/CommandBlockData.java
index 0310c2e..be0350d 100755
--- a/src/main/java/net/minecraft/command/CommandBlockData.java
+++ b/src/main/java/net/minecraft/command/CommandBlockData.java
@@ -1,11 +1,6 @@
 package net.minecraft.command;
 
 import java.util.List;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.CommandResultStats;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.nbt.JsonToNBT;
 import net.minecraft.nbt.NBTException;
 import net.minecraft.nbt.NBTTagCompound;
diff --git a/src/main/java/net/minecraft/command/CommandClearInventory.java b/src/main/java/net/minecraft/command/CommandClearInventory.java
index cec6d61..82bb4e8 100755
--- a/src/main/java/net/minecraft/command/CommandClearInventory.java
+++ b/src/main/java/net/minecraft/command/CommandClearInventory.java
@@ -1,10 +1,6 @@
 package net.minecraft.command;
 
 import java.util.List;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.CommandResultStats;
-import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.Item;
 import net.minecraft.nbt.JsonToNBT;
diff --git a/src/main/java/net/minecraft/command/CommandClone.java b/src/main/java/net/minecraft/command/CommandClone.java
index aacbdd2..ddcaf08 100755
--- a/src/main/java/net/minecraft/command/CommandClone.java
+++ b/src/main/java/net/minecraft/command/CommandClone.java
@@ -6,11 +6,6 @@ import java.util.LinkedList;
 import java.util.List;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.CommandResultStats;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.init.Blocks;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.nbt.NBTTagCompound;
@@ -174,7 +169,9 @@ public class CommandClone extends CommandBase {
 							arraylist3.addAll(arraylist2);
 							List list = Lists.reverse(arraylist3);
 
-							for (CommandClone.StaticCloneData commandclone$staticclonedata : (List<CommandClone.StaticCloneData>) list) {
+							for (int k = 0, l = list.size(); k < l; ++k) {
+								CommandClone.StaticCloneData commandclone$staticclonedata = (CommandClone.StaticCloneData) list
+										.get(k);
 								TileEntity tileentity2 = world
 										.getTileEntity(commandclone$staticclonedata.field_179537_a);
 								if (tileentity2 instanceof IInventory) {
@@ -187,14 +184,18 @@ public class CommandClone extends CommandBase {
 
 							i = 0;
 
-							for (CommandClone.StaticCloneData commandclone$staticclonedata1 : (ArrayList<CommandClone.StaticCloneData>) arraylist3) {
+							for (int k = 0, l = arraylist3.size(); k < l; ++k) {
+								CommandClone.StaticCloneData commandclone$staticclonedata1 = (CommandClone.StaticCloneData) arraylist3
+										.get(k);
 								if (world.setBlockState(commandclone$staticclonedata1.field_179537_a,
 										commandclone$staticclonedata1.blockState, 2)) {
 									++i;
 								}
 							}
 
-							for (CommandClone.StaticCloneData commandclone$staticclonedata2 : (ArrayList<CommandClone.StaticCloneData>) arraylist1) {
+							for (int k = 0, l = arraylist1.size(); k < l; ++k) {
+								CommandClone.StaticCloneData commandclone$staticclonedata2 = (CommandClone.StaticCloneData) arraylist1
+										.get(k);
 								TileEntity tileentity3 = world
 										.getTileEntity(commandclone$staticclonedata2.field_179537_a);
 								if (commandclone$staticclonedata2.field_179536_c != null && tileentity3 != null) {
@@ -212,14 +213,17 @@ public class CommandClone extends CommandBase {
 										commandclone$staticclonedata2.blockState, 2);
 							}
 
-							for (CommandClone.StaticCloneData commandclone$staticclonedata3 : (List<CommandClone.StaticCloneData>) list) {
+							for (int k = 0, l = list.size(); k < l; ++k) {
+								CommandClone.StaticCloneData commandclone$staticclonedata3 = (CommandClone.StaticCloneData) list
+										.get(k);
 								world.notifyNeighborsRespectDebug(commandclone$staticclonedata3.field_179537_a,
 										commandclone$staticclonedata3.blockState.getBlock());
 							}
 
 							List list1 = world.func_175712_a(structureboundingbox, false);
 							if (list1 != null) {
-								for (NextTickListEntry nextticklistentry : (List<NextTickListEntry>) list1) {
+								for (int k = 0, l = list1.size(); k < l; ++k) {
+									NextTickListEntry nextticklistentry = (NextTickListEntry) list1.get(k);
 									if (structureboundingbox.isVecInside(nextticklistentry.position)) {
 										BlockPos blockpos8 = nextticklistentry.position.add(blockpos3);
 										world.scheduleBlockUpdate(blockpos8, nextticklistentry.getBlock(),
diff --git a/src/main/java/net/minecraft/command/CommandCompare.java b/src/main/java/net/minecraft/command/CommandCompare.java
index b3cb28a..a5a0b7e 100755
--- a/src/main/java/net/minecraft/command/CommandCompare.java
+++ b/src/main/java/net/minecraft/command/CommandCompare.java
@@ -2,11 +2,6 @@ package net.minecraft.command;
 
 import java.util.List;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.CommandResultStats;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.init.Blocks;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
diff --git a/src/main/java/net/minecraft/command/CommandDefaultGameMode.java b/src/main/java/net/minecraft/command/CommandDefaultGameMode.java
index 3695aab..fd75088 100755
--- a/src/main/java/net/minecraft/command/CommandDefaultGameMode.java
+++ b/src/main/java/net/minecraft/command/CommandDefaultGameMode.java
@@ -1,9 +1,7 @@
 package net.minecraft.command;
 
-import net.minecraft.command.CommandException;
-import net.minecraft.command.CommandGameMode;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.WrongUsageException;
+import java.util.List;
+
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.ChatComponentTranslation;
@@ -64,8 +62,9 @@ public class CommandDefaultGameMode extends CommandGameMode {
 		MinecraftServer minecraftserver = MinecraftServer.getServer();
 		minecraftserver.setGameType(parGameType);
 		if (minecraftserver.getForceGamemode()) {
-			for (EntityPlayerMP entityplayermp : MinecraftServer.getServer().getConfigurationManager()
-					.func_181057_v()) {
+			List<EntityPlayerMP> lst = MinecraftServer.getServer().getConfigurationManager().func_181057_v();
+			for (int i = 0, l = lst.size(); i < l; ++i) {
+				EntityPlayerMP entityplayermp = lst.get(i);
 				entityplayermp.setGameType(parGameType);
 				entityplayermp.fallDistance = 0.0F;
 			}
diff --git a/src/main/java/net/minecraft/command/CommandDifficulty.java b/src/main/java/net/minecraft/command/CommandDifficulty.java
index a640e02..f9027b5 100755
--- a/src/main/java/net/minecraft/command/CommandDifficulty.java
+++ b/src/main/java/net/minecraft/command/CommandDifficulty.java
@@ -1,11 +1,6 @@
 package net.minecraft.command;
 
 import java.util.List;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.NumberInvalidException;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.ChatComponentTranslation;
diff --git a/src/main/java/net/minecraft/command/CommandEffect.java b/src/main/java/net/minecraft/command/CommandEffect.java
index 48a43a6..80b70d4 100755
--- a/src/main/java/net/minecraft/command/CommandEffect.java
+++ b/src/main/java/net/minecraft/command/CommandEffect.java
@@ -1,11 +1,6 @@
 package net.minecraft.command;
 
 import java.util.List;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.NumberInvalidException;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
diff --git a/src/main/java/net/minecraft/command/CommandEnchant.java b/src/main/java/net/minecraft/command/CommandEnchant.java
index 5ec34de..81fff5b 100755
--- a/src/main/java/net/minecraft/command/CommandEnchant.java
+++ b/src/main/java/net/minecraft/command/CommandEnchant.java
@@ -1,12 +1,6 @@
 package net.minecraft.command;
 
 import java.util.List;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.CommandResultStats;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.NumberInvalidException;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/net/minecraft/command/CommandEntityData.java b/src/main/java/net/minecraft/command/CommandEntityData.java
index 30c53c8..1c3c214 100755
--- a/src/main/java/net/minecraft/command/CommandEntityData.java
+++ b/src/main/java/net/minecraft/command/CommandEntityData.java
@@ -1,9 +1,5 @@
 package net.minecraft.command;
 
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.JsonToNBT;
diff --git a/src/main/java/net/minecraft/command/CommandExecuteAt.java b/src/main/java/net/minecraft/command/CommandExecuteAt.java
index 32c0636..850798e 100755
--- a/src/main/java/net/minecraft/command/CommandExecuteAt.java
+++ b/src/main/java/net/minecraft/command/CommandExecuteAt.java
@@ -3,12 +3,6 @@ package net.minecraft.command;
 import java.util.List;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.CommandResultStats;
-import net.minecraft.command.ICommandManager;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.entity.Entity;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.BlockPos;
diff --git a/src/main/java/net/minecraft/command/CommandFill.java b/src/main/java/net/minecraft/command/CommandFill.java
index d1fb592..6efd36a 100755
--- a/src/main/java/net/minecraft/command/CommandFill.java
+++ b/src/main/java/net/minecraft/command/CommandFill.java
@@ -5,11 +5,6 @@ import java.util.ArrayList;
 import java.util.List;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.CommandResultStats;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.init.Blocks;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.nbt.JsonToNBT;
@@ -182,7 +177,8 @@ public class CommandFill extends CommandBase {
 					}
 				}
 
-				for (BlockPos blockpos5 : (ArrayList<BlockPos>) arraylist) {
+				for (int m = 0, n = arraylist.size(); m < n; ++m) {
+					BlockPos blockpos5 = (BlockPos) arraylist.get(m);
 					Block block2 = world.getBlockState(blockpos5).getBlock();
 					world.notifyNeighborsRespectDebug(blockpos5, block2);
 				}
diff --git a/src/main/java/net/minecraft/command/CommandGameMode.java b/src/main/java/net/minecraft/command/CommandGameMode.java
index a730450..9d6048b 100755
--- a/src/main/java/net/minecraft/command/CommandGameMode.java
+++ b/src/main/java/net/minecraft/command/CommandGameMode.java
@@ -1,11 +1,6 @@
 package net.minecraft.command;
 
 import java.util.List;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.NumberInvalidException;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.BlockPos;
@@ -102,7 +97,7 @@ public class CommandGameMode extends CommandBase {
 																&& !parString1.equalsIgnoreCase("sp")
 																		? WorldSettings.getGameTypeById(parseInt(
 																				parString1, 0,
-																				WorldSettings.GameType.values().length
+																				WorldSettings.GameType._VALUES.length
 																						- 2))
 																		: WorldSettings.GameType.SPECTATOR)
 														: WorldSettings.GameType.ADVENTURE)
diff --git a/src/main/java/net/minecraft/command/CommandGameRule.java b/src/main/java/net/minecraft/command/CommandGameRule.java
index 6f6048b..f7168cf 100755
--- a/src/main/java/net/minecraft/command/CommandGameRule.java
+++ b/src/main/java/net/minecraft/command/CommandGameRule.java
@@ -1,10 +1,6 @@
 package net.minecraft.command;
 
 import java.util.List;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.CommandResultStats;
-import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.network.play.server.S19PacketEntityStatus;
 import net.minecraft.server.MinecraftServer;
@@ -92,8 +88,9 @@ public class CommandGameRule extends CommandBase {
 		if ("reducedDebugInfo".equals(parString1)) {
 			int i = parGameRules.getBoolean(parString1) ? 22 : 23;
 
-			for (EntityPlayerMP entityplayermp : MinecraftServer.getServer().getConfigurationManager()
-					.func_181057_v()) {
+			List<EntityPlayerMP> lst = MinecraftServer.getServer().getConfigurationManager().func_181057_v();
+			for (int j = 0, l = lst.size(); j < l; ++j) {
+				EntityPlayerMP entityplayermp = lst.get(j);
 				entityplayermp.playerNetServerHandler.sendPacket(new S19PacketEntityStatus(entityplayermp, (byte) i));
 			}
 		}
diff --git a/src/main/java/net/minecraft/command/CommandGive.java b/src/main/java/net/minecraft/command/CommandGive.java
index 033ac53..dbc0087 100755
--- a/src/main/java/net/minecraft/command/CommandGive.java
+++ b/src/main/java/net/minecraft/command/CommandGive.java
@@ -1,11 +1,6 @@
 package net.minecraft.command;
 
 import java.util.List;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.CommandResultStats;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.Item;
diff --git a/src/main/java/net/minecraft/command/CommandHandler.java b/src/main/java/net/minecraft/command/CommandHandler.java
index 3b815a2..948192b 100755
--- a/src/main/java/net/minecraft/command/CommandHandler.java
+++ b/src/main/java/net/minecraft/command/CommandHandler.java
@@ -8,14 +8,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.Map.Entry;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.CommandResultStats;
-import net.minecraft.command.ICommand;
-import net.minecraft.command.ICommandManager;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.PlayerSelector;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.ChatComponentTranslation;
@@ -75,8 +67,8 @@ public class CommandHandler implements ICommandManager {
 				String s1 = astring[i];
 				sender.setCommandStat(CommandResultStats.Type.AFFECTED_ENTITIES, list.size());
 
-				for (Entity entity : (List<Entity>) list) {
-					astring[i] = entity.getUniqueID().toString();
+				for (int k = 0, l = list.size(); k < l; ++k) {
+					astring[i] = ((Entity) list.get(k)).getUniqueID().toString();
 					if (this.tryExecute(sender, astring, icommand, rawCommand)) {
 						++j;
 					}
diff --git a/src/main/java/net/minecraft/command/CommandHelp.java b/src/main/java/net/minecraft/command/CommandHelp.java
index 32d0185..98d6d0b 100755
--- a/src/main/java/net/minecraft/command/CommandHelp.java
+++ b/src/main/java/net/minecraft/command/CommandHelp.java
@@ -5,13 +5,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.CommandNotFoundException;
-import net.minecraft.command.ICommand;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.NumberInvalidException;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.event.ClickEvent;
 import net.minecraft.server.MinecraftServer;
diff --git a/src/main/java/net/minecraft/command/CommandKill.java b/src/main/java/net/minecraft/command/CommandKill.java
index a4a2eec..da568c3 100755
--- a/src/main/java/net/minecraft/command/CommandKill.java
+++ b/src/main/java/net/minecraft/command/CommandKill.java
@@ -1,9 +1,6 @@
 package net.minecraft.command;
 
 import java.util.List;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.server.MinecraftServer;
diff --git a/src/main/java/net/minecraft/command/CommandNotFoundException.java b/src/main/java/net/minecraft/command/CommandNotFoundException.java
index 6cd612a..b9b5ac8 100755
--- a/src/main/java/net/minecraft/command/CommandNotFoundException.java
+++ b/src/main/java/net/minecraft/command/CommandNotFoundException.java
@@ -1,7 +1,5 @@
 package net.minecraft.command;
 
-import net.minecraft.command.CommandException;
-
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
  * 
diff --git a/src/main/java/net/minecraft/command/CommandParticle.java b/src/main/java/net/minecraft/command/CommandParticle.java
index 83160fc..9e7d3ad 100755
--- a/src/main/java/net/minecraft/command/CommandParticle.java
+++ b/src/main/java/net/minecraft/command/CommandParticle.java
@@ -1,10 +1,6 @@
 package net.minecraft.command;
 
 import java.util.List;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumParticleTypes;
 import net.minecraft.util.Vec3;
@@ -64,7 +60,9 @@ public class CommandParticle extends CommandBase {
 			boolean flag = false;
 			EnumParticleTypes enumparticletypes = null;
 
-			for (EnumParticleTypes enumparticletypes1 : EnumParticleTypes.values()) {
+			EnumParticleTypes[] types = EnumParticleTypes._VALUES;
+			for (int i = 0; i < types.length; ++i) {
+				EnumParticleTypes enumparticletypes1 = types[i];
 				if (enumparticletypes1.hasArguments()) {
 					if (parArrayOfString[0].startsWith(enumparticletypes1.getParticleName())) {
 						flag = true;
diff --git a/src/main/java/net/minecraft/command/CommandPlaySound.java b/src/main/java/net/minecraft/command/CommandPlaySound.java
index 087de16..fbee124 100755
--- a/src/main/java/net/minecraft/command/CommandPlaySound.java
+++ b/src/main/java/net/minecraft/command/CommandPlaySound.java
@@ -1,10 +1,6 @@
 package net.minecraft.command;
 
 import java.util.List;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.network.play.server.S29PacketSoundEffect;
 import net.minecraft.server.MinecraftServer;
diff --git a/src/main/java/net/minecraft/command/CommandReplaceItem.java b/src/main/java/net/minecraft/command/CommandReplaceItem.java
index 8e71343..d174b70 100755
--- a/src/main/java/net/minecraft/command/CommandReplaceItem.java
+++ b/src/main/java/net/minecraft/command/CommandReplaceItem.java
@@ -4,12 +4,6 @@ import com.google.common.collect.Maps;
 import java.util.List;
 import java.util.Map;
 import net.minecraft.block.Block;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.CommandResultStats;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.NumberInvalidException;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
diff --git a/src/main/java/net/minecraft/command/CommandResultStats.java b/src/main/java/net/minecraft/command/CommandResultStats.java
index fbb97bb..eba2055 100755
--- a/src/main/java/net/minecraft/command/CommandResultStats.java
+++ b/src/main/java/net/minecraft/command/CommandResultStats.java
@@ -1,8 +1,5 @@
 package net.minecraft.command;
 
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.EntityNotFoundException;
-import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.Entity;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.scoreboard.Score;
@@ -38,7 +35,7 @@ public class CommandResultStats {
 	/**+
 	 * The number of result command result types that are possible.
 	 */
-	private static final int NUM_RESULT_TYPES = CommandResultStats.Type.values().length;
+	private static final int NUM_RESULT_TYPES = CommandResultStats.Type._VALUES.length;
 	private static final String[] STRING_RESULT_TYPES = new String[NUM_RESULT_TYPES];
 	private String[] field_179675_c;
 	private String[] field_179673_d;
@@ -118,7 +115,9 @@ public class CommandResultStats {
 		if (tagcompound.hasKey("CommandStats", 10)) {
 			NBTTagCompound nbttagcompound = tagcompound.getCompoundTag("CommandStats");
 
-			for (CommandResultStats.Type commandresultstats$type : CommandResultStats.Type.values()) {
+			CommandResultStats.Type[] types = CommandResultStats.Type.values();
+			for (int i = 0; i < types.length; ++i) {
+				CommandResultStats.Type commandresultstats$type = types[i];
 				String s = commandresultstats$type.getTypeName() + "Name";
 				String s1 = commandresultstats$type.getTypeName() + "Objective";
 				if (nbttagcompound.hasKey(s, 8) && nbttagcompound.hasKey(s1, 8)) {
@@ -134,7 +133,9 @@ public class CommandResultStats {
 	public void writeStatsToNBT(NBTTagCompound tagcompound) {
 		NBTTagCompound nbttagcompound = new NBTTagCompound();
 
-		for (CommandResultStats.Type commandresultstats$type : CommandResultStats.Type.values()) {
+		CommandResultStats.Type[] types = CommandResultStats.Type.values();
+		for (int i = 0; i < types.length; ++i) {
+			CommandResultStats.Type commandresultstats$type = types[i];
 			String s = this.field_179675_c[commandresultstats$type.getTypeID()];
 			String s1 = this.field_179673_d[commandresultstats$type.getTypeID()];
 			if (s != null && s1 != null) {
@@ -171,7 +172,9 @@ public class CommandResultStats {
 			resultStatsIn.field_179673_d[resultTypeIn.getTypeID()] = null;
 			boolean flag = true;
 
-			for (CommandResultStats.Type commandresultstats$type : CommandResultStats.Type.values()) {
+			CommandResultStats.Type[] types = CommandResultStats.Type.values();
+			for (int i = 0; i < types.length; ++i) {
+				CommandResultStats.Type commandresultstats$type = types[i];
 				if (resultStatsIn.field_179675_c[commandresultstats$type.getTypeID()] != null
 						&& resultStatsIn.field_179673_d[commandresultstats$type.getTypeID()] != null) {
 					flag = false;
@@ -188,7 +191,9 @@ public class CommandResultStats {
 	}
 
 	public void func_179671_a(CommandResultStats resultStatsIn) {
-		for (CommandResultStats.Type commandresultstats$type : CommandResultStats.Type.values()) {
+		CommandResultStats.Type[] types = CommandResultStats.Type.values();
+		for (int i = 0; i < types.length; ++i) {
+			CommandResultStats.Type commandresultstats$type = types[i];
 			func_179667_a(this, commandresultstats$type,
 					resultStatsIn.field_179675_c[commandresultstats$type.getTypeID()],
 					resultStatsIn.field_179673_d[commandresultstats$type.getTypeID()]);
@@ -200,6 +205,8 @@ public class CommandResultStats {
 		SUCCESS_COUNT(0, "SuccessCount"), AFFECTED_BLOCKS(1, "AffectedBlocks"),
 		AFFECTED_ENTITIES(2, "AffectedEntities"), AFFECTED_ITEMS(3, "AffectedItems"), QUERY_RESULT(4, "QueryResult");
 
+		public static final Type[] _VALUES = values();
+
 		final int typeID;
 		final String typeName;
 
@@ -217,18 +224,21 @@ public class CommandResultStats {
 		}
 
 		public static String[] getTypeNames() {
-			String[] astring = new String[values().length];
+			String[] astring = new String[_VALUES.length];
 			int i = 0;
 
-			for (CommandResultStats.Type commandresultstats$type : values()) {
-				astring[i++] = commandresultstats$type.getTypeName();
+			CommandResultStats.Type[] types = _VALUES;
+			for (int j = 0; j < types.length; ++j) {
+				astring[i++] = types[j].getTypeName();
 			}
 
 			return astring;
 		}
 
 		public static CommandResultStats.Type getTypeByName(String name) {
-			for (CommandResultStats.Type commandresultstats$type : values()) {
+			CommandResultStats.Type[] types = _VALUES;
+			for (int i = 0; i < types.length; ++i) {
+				CommandResultStats.Type commandresultstats$type = types[i];
 				if (commandresultstats$type.getTypeName().equals(name)) {
 					return commandresultstats$type;
 				}
diff --git a/src/main/java/net/minecraft/command/CommandServerKick.java b/src/main/java/net/minecraft/command/CommandServerKick.java
index 63c62bc..3fb50f0 100755
--- a/src/main/java/net/minecraft/command/CommandServerKick.java
+++ b/src/main/java/net/minecraft/command/CommandServerKick.java
@@ -1,11 +1,6 @@
 package net.minecraft.command;
 
 import java.util.List;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.PlayerNotFoundException;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.BlockPos;
diff --git a/src/main/java/net/minecraft/command/CommandSetPlayerTimeout.java b/src/main/java/net/minecraft/command/CommandSetPlayerTimeout.java
index a15c44c..3bcf8d3 100755
--- a/src/main/java/net/minecraft/command/CommandSetPlayerTimeout.java
+++ b/src/main/java/net/minecraft/command/CommandSetPlayerTimeout.java
@@ -1,9 +1,5 @@
 package net.minecraft.command;
 
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.server.MinecraftServer;
 
 /**+
diff --git a/src/main/java/net/minecraft/command/CommandSetSpawnpoint.java b/src/main/java/net/minecraft/command/CommandSetSpawnpoint.java
index cf5ae8b..148a71d 100755
--- a/src/main/java/net/minecraft/command/CommandSetSpawnpoint.java
+++ b/src/main/java/net/minecraft/command/CommandSetSpawnpoint.java
@@ -1,10 +1,6 @@
 package net.minecraft.command;
 
 import java.util.List;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.BlockPos;
diff --git a/src/main/java/net/minecraft/command/CommandShowSeed.java b/src/main/java/net/minecraft/command/CommandShowSeed.java
index 4296259..2472688 100755
--- a/src/main/java/net/minecraft/command/CommandShowSeed.java
+++ b/src/main/java/net/minecraft/command/CommandShowSeed.java
@@ -1,8 +1,5 @@
 package net.minecraft.command;
 
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.ChatComponentTranslation;
diff --git a/src/main/java/net/minecraft/command/CommandSpreadPlayers.java b/src/main/java/net/minecraft/command/CommandSpreadPlayers.java
index 88de0d9..d080af5 100755
--- a/src/main/java/net/minecraft/command/CommandSpreadPlayers.java
+++ b/src/main/java/net/minecraft/command/CommandSpreadPlayers.java
@@ -10,14 +10,6 @@ import java.util.List;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 import net.lax1dude.eaglercraft.v1_8.HString;
 import net.minecraft.block.material.Material;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.CommandResultStats;
-import net.minecraft.command.EntityNotFoundException;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.PlayerNotFoundException;
-import net.minecraft.command.PlayerSelector;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -147,7 +139,8 @@ public class CommandSpreadPlayers extends CommandBase {
 	private int func_110667_a(List<Entity> parList) {
 		HashSet hashset = Sets.newHashSet();
 
-		for (Entity entity : parList) {
+		for (int i = 0, l = parList.size(); i < l; ++i) {
+			Entity entity = parList.get(i);
 			if (entity instanceof EntityPlayer) {
 				hashset.add(((EntityPlayer) entity).getTeam());
 			} else {
@@ -210,10 +203,9 @@ public class CommandSpreadPlayers extends CommandBase {
 			}
 
 			if (!flag) {
-				for (CommandSpreadPlayers.Position commandspreadplayers$position3 : parArrayOfPosition) {
-					if (!commandspreadplayers$position3.func_111098_b(parWorld)) {
-						commandspreadplayers$position3.func_111097_a(parRandom, parDouble2, parDouble3, parDouble4,
-								parDouble5);
+				for (int k = 0; k < parArrayOfPosition.length; ++k) {
+					if (!parArrayOfPosition[k].func_111098_b(parWorld)) {
+						parArrayOfPosition[k].func_111097_a(parRandom, parDouble2, parDouble3, parDouble4, parDouble5);
 						flag = true;
 					}
 				}
diff --git a/src/main/java/net/minecraft/command/CommandStats.java b/src/main/java/net/minecraft/command/CommandStats.java
index 9c1f4ef..2f73bb5 100755
--- a/src/main/java/net/minecraft/command/CommandStats.java
+++ b/src/main/java/net/minecraft/command/CommandStats.java
@@ -4,11 +4,6 @@ import com.google.common.collect.Lists;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.CommandResultStats;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.entity.Entity;
 import net.minecraft.scoreboard.ScoreObjective;
 import net.minecraft.server.MinecraftServer;
diff --git a/src/main/java/net/minecraft/command/CommandTime.java b/src/main/java/net/minecraft/command/CommandTime.java
index 373a71d..b0ebb08 100755
--- a/src/main/java/net/minecraft/command/CommandTime.java
+++ b/src/main/java/net/minecraft/command/CommandTime.java
@@ -1,11 +1,6 @@
 package net.minecraft.command;
 
 import java.util.List;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.CommandResultStats;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.WorldServer;
diff --git a/src/main/java/net/minecraft/command/CommandTitle.java b/src/main/java/net/minecraft/command/CommandTitle.java
index 5f4a621..e4bf88c 100755
--- a/src/main/java/net/minecraft/command/CommandTitle.java
+++ b/src/main/java/net/minecraft/command/CommandTitle.java
@@ -4,11 +4,6 @@ import java.util.List;
 
 import org.json.JSONException;
 
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.SyntaxErrorException;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.network.play.server.S45PacketTitle;
 import net.minecraft.server.MinecraftServer;
diff --git a/src/main/java/net/minecraft/command/CommandToggleDownfall.java b/src/main/java/net/minecraft/command/CommandToggleDownfall.java
index 6332d0b..f3da57d 100755
--- a/src/main/java/net/minecraft/command/CommandToggleDownfall.java
+++ b/src/main/java/net/minecraft/command/CommandToggleDownfall.java
@@ -1,8 +1,5 @@
 package net.minecraft.command;
 
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.storage.WorldInfo;
 
diff --git a/src/main/java/net/minecraft/command/CommandTrigger.java b/src/main/java/net/minecraft/command/CommandTrigger.java
index 49dc987..e5ec167 100755
--- a/src/main/java/net/minecraft/command/CommandTrigger.java
+++ b/src/main/java/net/minecraft/command/CommandTrigger.java
@@ -3,10 +3,6 @@ package net.minecraft.command;
 import com.google.common.collect.Lists;
 import java.util.ArrayList;
 import java.util.List;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.scoreboard.IScoreObjectiveCriteria;
diff --git a/src/main/java/net/minecraft/command/CommandWeather.java b/src/main/java/net/minecraft/command/CommandWeather.java
index 281f13a..b500b8b 100755
--- a/src/main/java/net/minecraft/command/CommandWeather.java
+++ b/src/main/java/net/minecraft/command/CommandWeather.java
@@ -2,10 +2,6 @@ package net.minecraft.command;
 
 import java.util.List;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.WorldServer;
diff --git a/src/main/java/net/minecraft/command/CommandWorldBorder.java b/src/main/java/net/minecraft/command/CommandWorldBorder.java
index 9d2b545..6bedbd2 100755
--- a/src/main/java/net/minecraft/command/CommandWorldBorder.java
+++ b/src/main/java/net/minecraft/command/CommandWorldBorder.java
@@ -3,11 +3,6 @@ package net.minecraft.command;
 import java.util.List;
 
 import net.lax1dude.eaglercraft.v1_8.HString;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.CommandResultStats;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.ChatComponentTranslation;
diff --git a/src/main/java/net/minecraft/command/CommandXP.java b/src/main/java/net/minecraft/command/CommandXP.java
index 6515a17..59b6f2b 100755
--- a/src/main/java/net/minecraft/command/CommandXP.java
+++ b/src/main/java/net/minecraft/command/CommandXP.java
@@ -1,11 +1,6 @@
 package net.minecraft.command;
 
 import java.util.List;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.CommandResultStats;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.BlockPos;
diff --git a/src/main/java/net/minecraft/command/IAdminCommand.java b/src/main/java/net/minecraft/command/IAdminCommand.java
index 51bc672..2773a97 100755
--- a/src/main/java/net/minecraft/command/IAdminCommand.java
+++ b/src/main/java/net/minecraft/command/IAdminCommand.java
@@ -1,8 +1,5 @@
 package net.minecraft.command;
 
-import net.minecraft.command.ICommand;
-import net.minecraft.command.ICommandSender;
-
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
  * 
diff --git a/src/main/java/net/minecraft/command/ICommand.java b/src/main/java/net/minecraft/command/ICommand.java
index 72c71f1..b1bc237 100755
--- a/src/main/java/net/minecraft/command/ICommand.java
+++ b/src/main/java/net/minecraft/command/ICommand.java
@@ -1,8 +1,6 @@
 package net.minecraft.command;
 
 import java.util.List;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
 import net.minecraft.util.BlockPos;
 
 /**+
diff --git a/src/main/java/net/minecraft/command/ICommandManager.java b/src/main/java/net/minecraft/command/ICommandManager.java
index b1c0670..41c77a3 100755
--- a/src/main/java/net/minecraft/command/ICommandManager.java
+++ b/src/main/java/net/minecraft/command/ICommandManager.java
@@ -2,8 +2,6 @@ package net.minecraft.command;
 
 import java.util.List;
 import java.util.Map;
-import net.minecraft.command.ICommand;
-import net.minecraft.command.ICommandSender;
 import net.minecraft.util.BlockPos;
 
 /**+
diff --git a/src/main/java/net/minecraft/command/ICommandSender.java b/src/main/java/net/minecraft/command/ICommandSender.java
index 3ea9d28..5275855 100755
--- a/src/main/java/net/minecraft/command/ICommandSender.java
+++ b/src/main/java/net/minecraft/command/ICommandSender.java
@@ -1,6 +1,5 @@
 package net.minecraft.command;
 
-import net.minecraft.command.CommandResultStats;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.IChatComponent;
diff --git a/src/main/java/net/minecraft/command/NumberInvalidException.java b/src/main/java/net/minecraft/command/NumberInvalidException.java
index 215e6d0..ee182d5 100755
--- a/src/main/java/net/minecraft/command/NumberInvalidException.java
+++ b/src/main/java/net/minecraft/command/NumberInvalidException.java
@@ -1,7 +1,5 @@
 package net.minecraft.command;
 
-import net.minecraft.command.CommandException;
-
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
  * 
diff --git a/src/main/java/net/minecraft/command/PlayerSelector.java b/src/main/java/net/minecraft/command/PlayerSelector.java
index 00dd323..c5c6aa7 100755
--- a/src/main/java/net/minecraft/command/PlayerSelector.java
+++ b/src/main/java/net/minecraft/command/PlayerSelector.java
@@ -16,8 +16,6 @@ import java.util.Set;
 import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityList;
 import net.minecraft.entity.EntityLivingBase;
@@ -96,14 +94,14 @@ public class PlayerSelector {
 	}
 
 	public static IChatComponent matchEntitiesToChatComponent(ICommandSender sender, String token) {
-		List list = matchEntities(sender, token, Entity.class);
+		List<Entity> list = matchEntities(sender, token, Entity.class);
 		if (list.isEmpty()) {
 			return null;
 		} else {
 			ArrayList arraylist = Lists.newArrayList();
 
-			for (Entity entity : (ArrayList<Entity>) list) {
-				arraylist.add(entity.getDisplayName());
+			for (int i = 0, l = list.size(); i < l; ++i) {
+				arraylist.add(list.get(i).getDisplayName());
 			}
 
 			return CommandBase.join(arraylist);
@@ -120,10 +118,11 @@ public class PlayerSelector {
 			} else {
 				String s = matcher.group(1);
 				BlockPos blockpos = func_179664_b(map, sender.getPosition());
-				List list = getWorlds(sender, map);
+				List<World> list = getWorlds(sender, map);
 				ArrayList arraylist = Lists.newArrayList();
 
-				for (World world : (ArrayList<World>) list) {
+				for (int i = 0, l = list.size(); i < l; ++i) {
+					World world = list.get(i);
 					if (world != null) {
 						ArrayList arraylist1 = Lists.newArrayList();
 						arraylist1.addAll(func_179663_a(map, s));
diff --git a/src/main/java/net/minecraft/command/ServerCommandManager.java b/src/main/java/net/minecraft/command/ServerCommandManager.java
index fac1602..2949725 100755
--- a/src/main/java/net/minecraft/command/ServerCommandManager.java
+++ b/src/main/java/net/minecraft/command/ServerCommandManager.java
@@ -14,11 +14,13 @@ import net.minecraft.command.server.CommandSummon;
 import net.minecraft.command.server.CommandTeleport;
 import net.minecraft.command.server.CommandTestFor;
 import net.minecraft.command.server.CommandTestForBlock;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.ChatComponentTranslation;
 import net.minecraft.util.EnumChatFormatting;
 
+import java.util.List;
+
 import net.lax1dude.eaglercraft.v1_8.sp.server.ClientCommandDummy;
 
 /**+
@@ -109,7 +111,9 @@ public class ServerCommandManager extends CommandHandler implements IAdminComman
 		chatcomponenttranslation.getChatStyle().setColor(EnumChatFormatting.GRAY);
 		chatcomponenttranslation.getChatStyle().setItalic(Boolean.valueOf(true));
 		if (flag) {
-			for (EntityPlayer entityplayer : minecraftserver.getConfigurationManager().func_181057_v()) {
+			List<EntityPlayerMP> players = minecraftserver.getConfigurationManager().func_181057_v();
+			for (int i = 0, l = players.size(); i < l; ++i) {
+				EntityPlayerMP entityplayer = players.get(i);
 				if (entityplayer != sender
 						&& minecraftserver.getConfigurationManager().canSendCommands(entityplayer.getGameProfile())
 						&& command.canCommandSenderUseCommand(sender)) {
diff --git a/src/main/java/net/minecraft/command/SyntaxErrorException.java b/src/main/java/net/minecraft/command/SyntaxErrorException.java
index 49e64ba..d965d32 100755
--- a/src/main/java/net/minecraft/command/SyntaxErrorException.java
+++ b/src/main/java/net/minecraft/command/SyntaxErrorException.java
@@ -1,7 +1,5 @@
 package net.minecraft.command;
 
-import net.minecraft.command.CommandException;
-
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
  * 
diff --git a/src/main/java/net/minecraft/command/WrongUsageException.java b/src/main/java/net/minecraft/command/WrongUsageException.java
index a09e29e..e8d1e90 100755
--- a/src/main/java/net/minecraft/command/WrongUsageException.java
+++ b/src/main/java/net/minecraft/command/WrongUsageException.java
@@ -1,7 +1,5 @@
 package net.minecraft.command;
 
-import net.minecraft.command.SyntaxErrorException;
-
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
  * 
diff --git a/src/main/java/net/minecraft/command/server/CommandAchievement.java b/src/main/java/net/minecraft/command/server/CommandAchievement.java
index 8e50d42..34ce6fd 100755
--- a/src/main/java/net/minecraft/command/server/CommandAchievement.java
+++ b/src/main/java/net/minecraft/command/server/CommandAchievement.java
@@ -80,15 +80,16 @@ public class CommandAchievement extends CommandBase {
 				if (flag || flag1) {
 					if (statbase == null) {
 						if (flag) {
-							for (Achievement achievement4 : AchievementList.achievementList) {
-								entityplayermp.triggerAchievement(achievement4);
+							for (int i = 0, l = AchievementList.achievementList.size(); i < l; ++i) {
+								entityplayermp.triggerAchievement(AchievementList.achievementList.get(i));
 							}
 
 							notifyOperators(parICommandSender, this, "commands.achievement.give.success.all",
 									new Object[] { entityplayermp.getName() });
 						} else if (flag1) {
-							for (Achievement achievement5 : Lists.reverse(AchievementList.achievementList)) {
-								entityplayermp.func_175145_a(achievement5);
+							List<Achievement> ach = Lists.reverse(AchievementList.achievementList);
+							for (int i = 0, l = ach.size(); i < l; ++i) {
+								entityplayermp.func_175145_a(ach.get(i));
 							}
 
 							notifyOperators(parICommandSender, this, "commands.achievement.take.success.all",
@@ -111,8 +112,9 @@ public class CommandAchievement extends CommandBase {
 									arraylist.add(achievement.parentAchievement);
 								}
 
-								for (Achievement achievement1 : (List<Achievement>) Lists.reverse(arraylist)) {
-									entityplayermp.triggerAchievement(achievement1);
+								List<Achievement> ach = Lists.reverse(AchievementList.achievementList);
+								for (int i = 0, l = ach.size(); i < l; ++i) {
+									entityplayermp.triggerAchievement(ach.get(i));
 								}
 							} else if (flag1) {
 								if (!entityplayermp.getStatFile().hasAchievementUnlocked(achievement)) {
@@ -129,7 +131,8 @@ public class CommandAchievement extends CommandBase {
 										}));
 								ArrayList arraylist2 = Lists.newArrayList(arraylist1);
 
-								for (Achievement achievement2 : (ArrayList<Achievement>) arraylist1) {
+								for (int i = 0, l = arraylist1.size(); i < l; ++i) {
+									Achievement achievement2 = (Achievement) arraylist1.get(i);
 									Achievement achievement3 = achievement2;
 
 									boolean flag2;
@@ -146,8 +149,8 @@ public class CommandAchievement extends CommandBase {
 									}
 								}
 
-								for (Achievement achievement6 : (ArrayList<Achievement>) arraylist2) {
-									entityplayermp.func_175145_a(achievement6);
+								for (int i = 0, l = arraylist2.size(); i < l; ++i) {
+									entityplayermp.func_175145_a((Achievement) arraylist2.get(i));
 								}
 							}
 						}
@@ -181,8 +184,8 @@ public class CommandAchievement extends CommandBase {
 		} else {
 			ArrayList arraylist = Lists.newArrayList();
 
-			for (StatBase statbase : StatList.allStats) {
-				arraylist.add(statbase.statId);
+			for (int i = 0, l = StatList.allStats.size(); i < l; ++i) {
+				arraylist.add(StatList.allStats.get(i).statId);
 			}
 
 			return getListOfStringsMatchingLastWord(astring, arraylist);
diff --git a/src/main/java/net/minecraft/command/server/CommandBlockLogic.java b/src/main/java/net/minecraft/command/server/CommandBlockLogic.java
index c76af43..46bf6ae 100755
--- a/src/main/java/net/minecraft/command/server/CommandBlockLogic.java
+++ b/src/main/java/net/minecraft/command/server/CommandBlockLogic.java
@@ -1,6 +1,5 @@
 package net.minecraft.command.server;
 
-import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.netty.ByteBuf;
 
 import java.text.SimpleDateFormat;
diff --git a/src/main/java/net/minecraft/command/server/CommandScoreboard.java b/src/main/java/net/minecraft/command/server/CommandScoreboard.java
index 6a4196f..8f6edd1 100755
--- a/src/main/java/net/minecraft/command/server/CommandScoreboard.java
+++ b/src/main/java/net/minecraft/command/server/CommandScoreboard.java
@@ -256,7 +256,8 @@ public class CommandScoreboard extends CommandBase {
 			String s = parArrayOfString[i];
 			ArrayList arraylist = Lists.newArrayList();
 
-			for (String s1 : (ArrayList<String>) arraylist1) {
+			for (int j = 0, l = arraylist1.size(); j < l; ++j) {
+				String s1 = (String) arraylist1.get(j);
 				parArrayOfString[i] = s1;
 
 				try {
@@ -517,7 +518,9 @@ public class CommandScoreboard extends CommandBase {
 			while (parInt1 < parArrayOfString.length) {
 				String s1 = parArrayOfString[parInt1++];
 				if (s1.startsWith("@")) {
-					for (Entity entity : func_175763_c(parICommandSender, s1)) {
+					List<Entity> lst = func_175763_c(parICommandSender, s1);
+					for (int i = 0, l = lst.size(); i < l; ++i) {
+						Entity entity = lst.get(i);
 						String s3 = getEntityName(parICommandSender, entity.getUniqueID().toString());
 						if (scoreboard.addPlayerToTeam(s3, s)) {
 							hashset.add(s3);
@@ -565,7 +568,9 @@ public class CommandScoreboard extends CommandBase {
 			while (parInt1 < parArrayOfString.length) {
 				String s = parArrayOfString[parInt1++];
 				if (s.startsWith("@")) {
-					for (Entity entity : func_175763_c(parICommandSender, s)) {
+					List<Entity> lst = func_175763_c(parICommandSender, s);
+					for (int i = 0, l = lst.size(); i < l; ++i) {
+						Entity entity = lst.get(i);
 						String s2 = getEntityName(parICommandSender, entity.getUniqueID().toString());
 						if (scoreboard.removePlayerFromTeams(s2)) {
 							hashset.add(s2);
@@ -601,14 +606,14 @@ public class CommandScoreboard extends CommandBase {
 		Scoreboard scoreboard = this.getScoreboard();
 		ScorePlayerTeam scoreplayerteam = this.getTeam(parArrayOfString[parInt1]);
 		if (scoreplayerteam != null) {
-			ArrayList arraylist = Lists.newArrayList(scoreplayerteam.getMembershipCollection());
+			ArrayList<String> arraylist = Lists.newArrayList(scoreplayerteam.getMembershipCollection());
 			parICommandSender.setCommandStat(CommandResultStats.Type.AFFECTED_ENTITIES, arraylist.size());
 			if (arraylist.isEmpty()) {
 				throw new CommandException("commands.scoreboard.teams.empty.alreadyEmpty",
 						new Object[] { scoreplayerteam.getRegisteredName() });
 			} else {
-				for (String s : (ArrayList<String>) arraylist) {
-					scoreboard.removePlayerFromTeam(s, scoreplayerteam);
+				for (int i = 0, l = arraylist.size(); i < l; ++i) {
+					scoreboard.removePlayerFromTeam(arraylist.get(i), scoreplayerteam);
 				}
 
 				notifyOperators(parICommandSender, this, "commands.scoreboard.teams.empty.success",
diff --git a/src/main/java/net/minecraft/crash/CrashReport.java b/src/main/java/net/minecraft/crash/CrashReport.java
index f1b25e3..e352af1 100755
--- a/src/main/java/net/minecraft/crash/CrashReport.java
+++ b/src/main/java/net/minecraft/crash/CrashReport.java
@@ -1,7 +1,5 @@
 package net.minecraft.crash;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
@@ -11,7 +9,6 @@ import com.google.common.collect.Lists;
 
 import net.lax1dude.eaglercraft.v1_8.ArrayUtils;
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
-import net.lax1dude.eaglercraft.v1_8.IOUtils;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumPlatformType;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
@@ -131,16 +128,16 @@ public class CrashReport {
 			builder.append("-- Head --\n");
 			builder.append("Stacktrace:\n");
 
-			for (String stacktraceelement : this.stacktrace) {
-				builder.append("\t").append("at ").append(stacktraceelement.toString());
+			for (int i = 0; i < this.stacktrace.length; ++i) {
+				builder.append("\t").append("at ").append(this.stacktrace[i].toString());
 				builder.append("\n");
 			}
 
 			builder.append("\n");
 		}
 
-		for (CrashReportCategory crashreportcategory : this.crashReportSections) {
-			crashreportcategory.appendToStringBuilder(builder);
+		for (int i = 0, l = this.crashReportSections.size(); i < l; ++i) {
+			this.crashReportSections.get(i).appendToStringBuilder(builder);
 			builder.append("\n\n");
 		}
 
diff --git a/src/main/java/net/minecraft/crash/CrashReportCategory.java b/src/main/java/net/minecraft/crash/CrashReportCategory.java
index ca5b582..598c0bc 100755
--- a/src/main/java/net/minecraft/crash/CrashReportCategory.java
+++ b/src/main/java/net/minecraft/crash/CrashReportCategory.java
@@ -189,7 +189,8 @@ public class CrashReportCategory {
 		builder.append("-- ").append(this.name).append(" --\n");
 		builder.append("Details:");
 
-		for (CrashReportCategory.Entry crashreportcategory$entry : this.children) {
+		for (int i = 0, l = this.children.size(); i < l; ++i) {
+			CrashReportCategory.Entry crashreportcategory$entry = this.children.get(i);
 			builder.append("\n\t");
 			builder.append(crashreportcategory$entry.getKey());
 			builder.append(": ");
@@ -199,9 +200,9 @@ public class CrashReportCategory {
 		if (this.stackTrace != null && this.stackTrace.length > 0) {
 			builder.append("\nStacktrace:");
 
-			for (String stacktraceelement : this.stackTrace) {
+			for (int i = 0; i < this.stackTrace.length; ++i) {
 				builder.append("\n\tat ");
-				builder.append(stacktraceelement);
+				builder.append(this.stackTrace[i]);
 			}
 		}
 
diff --git a/src/main/java/net/minecraft/creativetab/CreativeTabs.java b/src/main/java/net/minecraft/creativetab/CreativeTabs.java
index 6caac3c..08b76d6 100755
--- a/src/main/java/net/minecraft/creativetab/CreativeTabs.java
+++ b/src/main/java/net/minecraft/creativetab/CreativeTabs.java
@@ -211,8 +211,8 @@ public abstract class CreativeTabs {
 		if (this.enchantmentTypes == null) {
 			return false;
 		} else {
-			for (EnumEnchantmentType enumenchantmenttype : this.enchantmentTypes) {
-				if (enumenchantmenttype == enchantmentType) {
+			for (int i = 0; i < this.enchantmentTypes.length; ++i) {
+				if (this.enchantmentTypes[i] == enchantmentType) {
 					return true;
 				}
 			}
@@ -242,12 +242,13 @@ public abstract class CreativeTabs {
 	 * EnumEnchantmentType to the given list.
 	 */
 	public void addEnchantmentBooksToList(List<ItemStack> itemList, EnumEnchantmentType... enchantmentType) {
-		for (Enchantment enchantment : Enchantment.enchantmentsBookList) {
+		for (int i = 0; i < Enchantment.enchantmentsBookList.length; ++i) {
+			Enchantment enchantment = Enchantment.enchantmentsBookList[i];
 			if (enchantment != null && enchantment.type != null) {
 				boolean flag = false;
 
-				for (int i = 0; i < enchantmentType.length && !flag; ++i) {
-					if (enchantment.type == enchantmentType[i]) {
+				for (int j = 0; j < enchantmentType.length && !flag; ++j) {
+					if (enchantment.type == enchantmentType[j]) {
 						flag = true;
 					}
 				}
diff --git a/src/main/java/net/minecraft/enchantment/Enchantment.java b/src/main/java/net/minecraft/enchantment/Enchantment.java
index e4fc431..ae13abf 100755
--- a/src/main/java/net/minecraft/enchantment/Enchantment.java
+++ b/src/main/java/net/minecraft/enchantment/Enchantment.java
@@ -271,7 +271,8 @@ public abstract class Enchantment {
 	static {
 		ArrayList arraylist = Lists.newArrayList();
 
-		for (Enchantment enchantment : enchantmentsList) {
+		for (int i = 0; i < enchantmentsList.length; ++i) {
+			Enchantment enchantment = enchantmentsList[i];
 			if (enchantment != null) {
 				arraylist.add(enchantment);
 			}
diff --git a/src/main/java/net/minecraft/enchantment/EnchantmentHelper.java b/src/main/java/net/minecraft/enchantment/EnchantmentHelper.java
index 7dfa394..de7b02a 100755
--- a/src/main/java/net/minecraft/enchantment/EnchantmentHelper.java
+++ b/src/main/java/net/minecraft/enchantment/EnchantmentHelper.java
@@ -142,8 +142,8 @@ public class EnchantmentHelper {
 		} else {
 			int i = 0;
 
-			for (ItemStack itemstack : stacks) {
-				int j = getEnchantmentLevel(enchID, itemstack);
+			for (int k = 0; k < stacks.length; ++k) {
+				int j = getEnchantmentLevel(enchID, stacks[k]);
 				if (j > i) {
 					i = j;
 				}
@@ -177,8 +177,8 @@ public class EnchantmentHelper {
 	 * passed.
 	 */
 	private static void applyEnchantmentModifierArray(EnchantmentHelper.IModifier modifier, ItemStack[] stacks) {
-		for (ItemStack itemstack : stacks) {
-			applyEnchantmentModifier(modifier, itemstack);
+		for (int k = 0; k < stacks.length; ++k) {
+			applyEnchantmentModifier(modifier, stacks[k]);
 		}
 
 	}
@@ -356,7 +356,9 @@ public class EnchantmentHelper {
 	}
 
 	public static ItemStack getEnchantedItem(Enchantment parEnchantment, EntityLivingBase parEntityLivingBase) {
-		for (ItemStack itemstack : parEntityLivingBase.getInventory()) {
+		ItemStack[] stacks = parEntityLivingBase.getInventory();
+		for (int k = 0; k < stacks.length; ++k) {
+			ItemStack itemstack = stacks[k];
 			if (itemstack != null && getEnchantmentLevel(parEnchantment.effectId, itemstack) > 0) {
 				return itemstack;
 			}
@@ -391,14 +393,15 @@ public class EnchantmentHelper {
 	 * random, itemStack, enchantabilityLevel
 	 */
 	public static ItemStack addRandomEnchantment(EaglercraftRandom parRandom, ItemStack parItemStack, int parInt1) {
-		List list = buildEnchantmentList(parRandom, parItemStack, parInt1);
+		List<EnchantmentData> list = buildEnchantmentList(parRandom, parItemStack, parInt1);
 		boolean flag = parItemStack.getItem() == Items.book;
 		if (flag) {
 			parItemStack.setItem(Items.enchanted_book);
 		}
 
 		if (list != null) {
-			for (EnchantmentData enchantmentdata : (List<EnchantmentData>) list) {
+			for (int i = 0, l = list.size(); i < l; ++i) {
+				EnchantmentData enchantmentdata = list.get(i);
 				if (flag) {
 					Items.enchanted_book.addEnchantment(parItemStack, enchantmentdata);
 				} else {
@@ -431,7 +434,7 @@ public class EnchantmentHelper {
 				k = 1;
 			}
 
-			ArrayList arraylist = null;
+			ArrayList<EnchantmentData> arraylist = null;
 			Map map = mapEnchantmentData(k, itemStackIn);
 			if (map != null && !map.isEmpty()) {
 				EnchantmentData enchantmentdata = (EnchantmentData) WeightedRandom.getRandomItem(randomIn,
@@ -447,7 +450,8 @@ public class EnchantmentHelper {
 							Integer integer = (Integer) iterator.next();
 							boolean flag = true;
 
-							for (EnchantmentData enchantmentdata1 : (List<EnchantmentData>) arraylist) {
+							for (int m = 0, n = arraylist.size(); m < n; ++m) {
+								EnchantmentData enchantmentdata1 = arraylist.get(m);
 								if (!enchantmentdata1.enchantmentobj
 										.canApplyTogether(Enchantment.getEnchantmentById(integer.intValue()))) {
 									flag = false;
@@ -478,7 +482,8 @@ public class EnchantmentHelper {
 		HashMap hashmap = null;
 		boolean flag = parItemStack.getItem() == Items.book;
 
-		for (Enchantment enchantment : Enchantment.enchantmentsBookList) {
+		for (int j = 0; j < Enchantment.enchantmentsBookList.length; ++j) {
+			Enchantment enchantment = Enchantment.enchantmentsBookList[j];
 			if (enchantment != null && (enchantment.type.canEnchantItem(item) || flag)) {
 				for (int i = enchantment.getMinLevel(); i <= enchantment.getMaxLevel(); ++i) {
 					if (parInt1 >= enchantment.getMinEnchantability(i)
diff --git a/src/main/java/net/minecraft/entity/DataWatcher.java b/src/main/java/net/minecraft/entity/DataWatcher.java
index eb96b30..efa552a 100755
--- a/src/main/java/net/minecraft/entity/DataWatcher.java
+++ b/src/main/java/net/minecraft/entity/DataWatcher.java
@@ -167,8 +167,8 @@ public class DataWatcher {
 	public static void writeWatchedListToPacketBuffer(List<DataWatcher.WatchableObject> objectsList,
 			PacketBuffer buffer) throws IOException {
 		if (objectsList != null) {
-			for (DataWatcher.WatchableObject datawatcher$watchableobject : objectsList) {
-				writeWatchableObjectToPacketBuffer(buffer, datawatcher$watchableobject);
+			for (int i = 0, l = objectsList.size(); i < l; ++i) {
+				writeWatchableObjectToPacketBuffer(buffer, objectsList.get(i));
 			}
 		}
 
@@ -316,7 +316,8 @@ public class DataWatcher {
 
 	public void updateWatchedObjectsFromList(List<DataWatcher.WatchableObject> parList) {
 
-		for (DataWatcher.WatchableObject datawatcher$watchableobject : parList) {
+		for (int i = 0, l = parList.size(); i < l; ++i) {
+			DataWatcher.WatchableObject datawatcher$watchableobject = parList.get(i);
 			DataWatcher.WatchableObject datawatcher$watchableobject1 = (DataWatcher.WatchableObject) this.watchedObjects
 					.get(Integer.valueOf(datawatcher$watchableobject.getDataValueId()));
 			if (datawatcher$watchableobject1 != null) {
diff --git a/src/main/java/net/minecraft/entity/Entity.java b/src/main/java/net/minecraft/entity/Entity.java
index 8fee7fe..f131013 100755
--- a/src/main/java/net/minecraft/entity/Entity.java
+++ b/src/main/java/net/minecraft/entity/Entity.java
@@ -525,24 +525,25 @@ public abstract class Entity implements ICommandSender {
 				}
 			}
 
-			List list1 = this.worldObj.getCollidingBoundingBoxes(this, this.getEntityBoundingBox().addCoord(x, y, z));
+			List<AxisAlignedBB> list1 = this.worldObj.getCollidingBoundingBoxes(this,
+					this.getEntityBoundingBox().addCoord(x, y, z));
 			AxisAlignedBB axisalignedbb = this.getEntityBoundingBox();
 
-			for (AxisAlignedBB axisalignedbb1 : (List<AxisAlignedBB>) list1) {
-				y = axisalignedbb1.calculateYOffset(this.getEntityBoundingBox(), y);
+			for (int i = 0, l = list1.size(); i < l; ++i) {
+				y = list1.get(i).calculateYOffset(this.getEntityBoundingBox(), y);
 			}
 
 			this.setEntityBoundingBox(this.getEntityBoundingBox().offset(0.0D, y, 0.0D));
 			boolean flag1 = this.onGround || d4 != y && d4 < 0.0D;
 
-			for (AxisAlignedBB axisalignedbb2 : (List<AxisAlignedBB>) list1) {
-				x = axisalignedbb2.calculateXOffset(this.getEntityBoundingBox(), x);
+			for (int i = 0, l = list1.size(); i < l; ++i) {
+				x = list1.get(i).calculateXOffset(this.getEntityBoundingBox(), x);
 			}
 
 			this.setEntityBoundingBox(this.getEntityBoundingBox().offset(x, 0.0D, 0.0D));
 
-			for (AxisAlignedBB axisalignedbb13 : (List<AxisAlignedBB>) list1) {
-				z = axisalignedbb13.calculateZOffset(this.getEntityBoundingBox(), z);
+			for (int i = 0, l = list1.size(); i < l; ++i) {
+				z = list1.get(i).calculateZOffset(this.getEntityBoundingBox(), z);
 			}
 
 			this.setEntityBoundingBox(this.getEntityBoundingBox().offset(0.0D, 0.0D, z));
@@ -553,50 +554,50 @@ public abstract class Entity implements ICommandSender {
 				AxisAlignedBB axisalignedbb3 = this.getEntityBoundingBox();
 				this.setEntityBoundingBox(axisalignedbb);
 				y = (double) this.stepHeight;
-				List list = this.worldObj.getCollidingBoundingBoxes(this,
+				List<AxisAlignedBB> list = this.worldObj.getCollidingBoundingBoxes(this,
 						this.getEntityBoundingBox().addCoord(d3, y, d5));
 				AxisAlignedBB axisalignedbb4 = this.getEntityBoundingBox();
 				AxisAlignedBB axisalignedbb5 = axisalignedbb4.addCoord(d3, 0.0D, d5);
 				double d9 = y;
 
-				for (AxisAlignedBB axisalignedbb6 : (List<AxisAlignedBB>) list) {
-					d9 = axisalignedbb6.calculateYOffset(axisalignedbb5, d9);
+				for (int i = 0, l = list.size(); i < l; ++i) {
+					d9 = list.get(i).calculateYOffset(axisalignedbb5, d9);
 				}
 
 				axisalignedbb4 = axisalignedbb4.offset(0.0D, d9, 0.0D);
 				double d15 = d3;
 
-				for (AxisAlignedBB axisalignedbb7 : (List<AxisAlignedBB>) list) {
-					d15 = axisalignedbb7.calculateXOffset(axisalignedbb4, d15);
+				for (int i = 0, l = list.size(); i < l; ++i) {
+					d15 = list.get(i).calculateXOffset(axisalignedbb4, d15);
 				}
 
 				axisalignedbb4 = axisalignedbb4.offset(d15, 0.0D, 0.0D);
 				double d16 = d5;
 
-				for (AxisAlignedBB axisalignedbb8 : (List<AxisAlignedBB>) list) {
-					d16 = axisalignedbb8.calculateZOffset(axisalignedbb4, d16);
+				for (int i = 0, l = list.size(); i < l; ++i) {
+					d16 = list.get(i).calculateZOffset(axisalignedbb4, d16);
 				}
 
 				axisalignedbb4 = axisalignedbb4.offset(0.0D, 0.0D, d16);
 				AxisAlignedBB axisalignedbb14 = this.getEntityBoundingBox();
 				double d17 = y;
 
-				for (AxisAlignedBB axisalignedbb9 : (List<AxisAlignedBB>) list) {
-					d17 = axisalignedbb9.calculateYOffset(axisalignedbb14, d17);
+				for (int i = 0, l = list.size(); i < l; ++i) {
+					d17 = list.get(i).calculateYOffset(axisalignedbb14, d17);
 				}
 
 				axisalignedbb14 = axisalignedbb14.offset(0.0D, d17, 0.0D);
 				double d18 = d3;
 
-				for (AxisAlignedBB axisalignedbb10 : (List<AxisAlignedBB>) list) {
-					d18 = axisalignedbb10.calculateXOffset(axisalignedbb14, d18);
+				for (int i = 0, l = list.size(); i < l; ++i) {
+					d18 = list.get(i).calculateXOffset(axisalignedbb14, d18);
 				}
 
 				axisalignedbb14 = axisalignedbb14.offset(d18, 0.0D, 0.0D);
 				double d19 = d5;
 
-				for (AxisAlignedBB axisalignedbb11 : (List<AxisAlignedBB>) list) {
-					d19 = axisalignedbb11.calculateZOffset(axisalignedbb14, d19);
+				for (int i = 0, l = list.size(); i < l; ++i) {
+					d19 = list.get(i).calculateZOffset(axisalignedbb14, d19);
 				}
 
 				axisalignedbb14 = axisalignedbb14.offset(0.0D, 0.0D, d19);
@@ -614,8 +615,8 @@ public abstract class Entity implements ICommandSender {
 					this.setEntityBoundingBox(axisalignedbb14);
 				}
 
-				for (AxisAlignedBB axisalignedbb12 : (List<AxisAlignedBB>) list) {
-					y = axisalignedbb12.calculateYOffset(this.getEntityBoundingBox(), y);
+				for (int i = 0, l = list.size(); i < l; ++i) {
+					y = list.get(i).calculateYOffset(this.getEntityBoundingBox(), y);
 				}
 
 				this.setEntityBoundingBox(this.getEntityBoundingBox().offset(0.0D, y, 0.0D));
@@ -1454,8 +1455,8 @@ public abstract class Entity implements ICommandSender {
 	protected NBTTagList newDoubleNBTList(double... numbers) {
 		NBTTagList nbttaglist = new NBTTagList();
 
-		for (double d0 : numbers) {
-			nbttaglist.appendTag(new NBTTagDouble(d0));
+		for (int i = 0; i < numbers.length; ++i) {
+			nbttaglist.appendTag(new NBTTagDouble(numbers[i]));
 		}
 
 		return nbttaglist;
@@ -1467,8 +1468,8 @@ public abstract class Entity implements ICommandSender {
 	protected NBTTagList newFloatNBTList(float... numbers) {
 		NBTTagList nbttaglist = new NBTTagList();
 
-		for (float f : numbers) {
-			nbttaglist.appendTag(new NBTTagFloat(f));
+		for (int i = 0; i < numbers.length; ++i) {
+			nbttaglist.appendTag(new NBTTagFloat(numbers[i]));
 		}
 
 		return nbttaglist;
diff --git a/src/main/java/net/minecraft/entity/EntityHanging.java b/src/main/java/net/minecraft/entity/EntityHanging.java
index 846e869..ab3cee4 100755
--- a/src/main/java/net/minecraft/entity/EntityHanging.java
+++ b/src/main/java/net/minecraft/entity/EntityHanging.java
@@ -10,6 +10,8 @@ import net.minecraft.util.DamageSource;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
 
+import java.util.List;
+
 import org.apache.commons.lang3.Validate;
 
 /**+
@@ -140,9 +142,9 @@ public abstract class EntityHanging extends Entity {
 				}
 			}
 
-			for (Entity entity : this.worldObj.getEntitiesWithinAABBExcludingEntity(this,
-					this.getEntityBoundingBox())) {
-				if (entity instanceof EntityHanging) {
+			List<Entity> lst = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.getEntityBoundingBox());
+			for (int k = 0, l = lst.size(); k < l; ++k) {
+				if (lst.get(k) instanceof EntityHanging) {
 					return false;
 				}
 			}
diff --git a/src/main/java/net/minecraft/entity/EntityLeashKnot.java b/src/main/java/net/minecraft/entity/EntityLeashKnot.java
index 14a31af..fcff343 100755
--- a/src/main/java/net/minecraft/entity/EntityLeashKnot.java
+++ b/src/main/java/net/minecraft/entity/EntityLeashKnot.java
@@ -1,5 +1,7 @@
 package net.minecraft.entity;
 
+import java.util.List;
+
 import net.minecraft.block.BlockFence;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Items;
@@ -117,8 +119,10 @@ public class EntityLeashKnot extends EntityHanging {
 		if (itemstack != null && itemstack.getItem() == Items.lead && !this.worldObj.isRemote) {
 			double d0 = 7.0D;
 
-			for (EntityLiving entityliving : this.worldObj.getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB(
-					this.posX - d0, this.posY - d0, this.posZ - d0, this.posX + d0, this.posY + d0, this.posZ + d0))) {
+			List<EntityLiving> entities = this.worldObj.getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB(
+					this.posX - d0, this.posY - d0, this.posZ - d0, this.posX + d0, this.posY + d0, this.posZ + d0));
+			for (int i = 0, l = entities.size(); i < l; ++i) {
+				EntityLiving entityliving = entities.get(i);
 				if (entityliving.getLeashed() && entityliving.getLeashedToEntity() == entityplayer) {
 					entityliving.setLeashedToEntity(this, true);
 					flag = true;
@@ -131,9 +135,11 @@ public class EntityLeashKnot extends EntityHanging {
 			if (entityplayer.capabilities.isCreativeMode) {
 				double d1 = 7.0D;
 
-				for (EntityLiving entityliving1 : this.worldObj.getEntitiesWithinAABB(EntityLiving.class,
+				List<EntityLiving> entities = this.worldObj.getEntitiesWithinAABB(EntityLiving.class,
 						new AxisAlignedBB(this.posX - d1, this.posY - d1, this.posZ - d1, this.posX + d1,
-								this.posY + d1, this.posZ + d1))) {
+								this.posY + d1, this.posZ + d1));
+				for (int i = 0, l = entities.size(); i < l; ++i) {
+					EntityLiving entityliving1 = entities.get(i);
 					if (entityliving1.getLeashed() && entityliving1.getLeashedToEntity() == this) {
 						entityliving1.clearLeashed(true, false);
 					}
@@ -163,9 +169,11 @@ public class EntityLeashKnot extends EntityHanging {
 		int j = pos.getY();
 		int k = pos.getZ();
 
-		for (EntityLeashKnot entityleashknot : worldIn.getEntitiesWithinAABB(EntityLeashKnot.class,
+		List<EntityLeashKnot> entities = worldIn.getEntitiesWithinAABB(EntityLeashKnot.class,
 				new AxisAlignedBB((double) i - 1.0D, (double) j - 1.0D, (double) k - 1.0D, (double) i + 1.0D,
-						(double) j + 1.0D, (double) k + 1.0D))) {
+						(double) j + 1.0D, (double) k + 1.0D));
+		for (int m = 0, l = entities.size(); m < l; ++m) {
+			EntityLeashKnot entityleashknot = entities.get(m);
 			if (entityleashknot.getHangingPosition().equals(pos)) {
 				return entityleashknot;
 			}
diff --git a/src/main/java/net/minecraft/entity/EntityList.java b/src/main/java/net/minecraft/entity/EntityList.java
index dc04bfa..5c1a605 100755
--- a/src/main/java/net/minecraft/entity/EntityList.java
+++ b/src/main/java/net/minecraft/entity/EntityList.java
@@ -314,75 +314,74 @@ public class EntityList {
 	}
 
 	static {
-		addMapping(EntityItem.class, (w) -> new EntityItem(w), "Item", 1);
-		addMapping(EntityXPOrb.class, (w) -> new EntityXPOrb(w), "XPOrb", 2);
-		addMapping(EntityEgg.class, (w) -> new EntityEgg(w), "ThrownEgg", 7);
-		addMapping(EntityLeashKnot.class, (w) -> new EntityLeashKnot(w), "LeashKnot", 8);
-		addMapping(EntityPainting.class, (w) -> new EntityPainting(w), "Painting", 9);
-		addMapping(EntityArrow.class, (w) -> new EntityArrow(w), "Arrow", 10);
-		addMapping(EntitySnowball.class, (w) -> new EntitySnowball(w), "Snowball", 11);
-		addMapping(EntityLargeFireball.class, (w) -> new EntityLargeFireball(w), "Fireball", 12);
-		addMapping(EntitySmallFireball.class, (w) -> new EntitySmallFireball(w), "SmallFireball", 13);
-		addMapping(EntityEnderPearl.class, (w) -> new EntityEnderPearl(w), "ThrownEnderpearl", 14);
-		addMapping(EntityEnderEye.class, (w) -> new EntityEnderEye(w), "EyeOfEnderSignal", 15);
-		addMapping(EntityPotion.class, (w) -> new EntityPotion(w), "ThrownPotion", 16);
-		addMapping(EntityExpBottle.class, (w) -> new EntityExpBottle(w), "ThrownExpBottle", 17);
-		addMapping(EntityItemFrame.class, (w) -> new EntityItemFrame(w), "ItemFrame", 18);
-		addMapping(EntityWitherSkull.class, (w) -> new EntityWitherSkull(w), "WitherSkull", 19);
-		addMapping(EntityTNTPrimed.class, (w) -> new EntityTNTPrimed(w), "PrimedTnt", 20);
-		addMapping(EntityFallingBlock.class, (w) -> new EntityFallingBlock(w), "FallingSand", 21);
-		addMapping(EntityFireworkRocket.class, (w) -> new EntityFireworkRocket(w), "FireworksRocketEntity", 22);
-		addMapping(EntityArmorStand.class, (w) -> new EntityArmorStand(w), "ArmorStand", 30);
-		addMapping(EntityBoat.class, (w) -> new EntityBoat(w), "Boat", 41);
-		addMapping(EntityMinecartEmpty.class, (w) -> new EntityMinecartEmpty(w),
+		addMapping(EntityItem.class, EntityItem::new, "Item", 1);
+		addMapping(EntityXPOrb.class, EntityXPOrb::new, "XPOrb", 2);
+		addMapping(EntityEgg.class, EntityEgg::new, "ThrownEgg", 7);
+		addMapping(EntityLeashKnot.class, EntityLeashKnot::new, "LeashKnot", 8);
+		addMapping(EntityPainting.class, EntityPainting::new, "Painting", 9);
+		addMapping(EntityArrow.class, EntityArrow::new, "Arrow", 10);
+		addMapping(EntitySnowball.class, EntitySnowball::new, "Snowball", 11);
+		addMapping(EntityLargeFireball.class, EntityLargeFireball::new, "Fireball", 12);
+		addMapping(EntitySmallFireball.class, EntitySmallFireball::new, "SmallFireball", 13);
+		addMapping(EntityEnderPearl.class, EntityEnderPearl::new, "ThrownEnderpearl", 14);
+		addMapping(EntityEnderEye.class, EntityEnderEye::new, "EyeOfEnderSignal", 15);
+		addMapping(EntityPotion.class, EntityPotion::new, "ThrownPotion", 16);
+		addMapping(EntityExpBottle.class, EntityExpBottle::new, "ThrownExpBottle", 17);
+		addMapping(EntityItemFrame.class, EntityItemFrame::new, "ItemFrame", 18);
+		addMapping(EntityWitherSkull.class, EntityWitherSkull::new, "WitherSkull", 19);
+		addMapping(EntityTNTPrimed.class, EntityTNTPrimed::new, "PrimedTnt", 20);
+		addMapping(EntityFallingBlock.class, EntityFallingBlock::new, "FallingSand", 21);
+		addMapping(EntityFireworkRocket.class, EntityFireworkRocket::new, "FireworksRocketEntity", 22);
+		addMapping(EntityArmorStand.class, EntityArmorStand::new, "ArmorStand", 30);
+		addMapping(EntityBoat.class, EntityBoat::new, "Boat", 41);
+		addMapping(EntityMinecartEmpty.class, EntityMinecartEmpty::new,
 				EntityMinecart.EnumMinecartType.RIDEABLE.getName(), 42);
-		addMapping(EntityMinecartChest.class, (w) -> new EntityMinecartChest(w),
-				EntityMinecart.EnumMinecartType.CHEST.getName(), 43);
-		addMapping(EntityMinecartFurnace.class, (w) -> new EntityMinecartFurnace(w),
+		addMapping(EntityMinecartChest.class, EntityMinecartChest::new, EntityMinecart.EnumMinecartType.CHEST.getName(),
+				43);
+		addMapping(EntityMinecartFurnace.class, EntityMinecartFurnace::new,
 				EntityMinecart.EnumMinecartType.FURNACE.getName(), 44);
-		addMapping(EntityMinecartTNT.class, (w) -> new EntityMinecartTNT(w),
-				EntityMinecart.EnumMinecartType.TNT.getName(), 45);
-		addMapping(EntityMinecartHopper.class, (w) -> new EntityMinecartHopper(w),
+		addMapping(EntityMinecartTNT.class, EntityMinecartTNT::new, EntityMinecart.EnumMinecartType.TNT.getName(), 45);
+		addMapping(EntityMinecartHopper.class, EntityMinecartHopper::new,
 				EntityMinecart.EnumMinecartType.HOPPER.getName(), 46);
-		addMapping(EntityMinecartMobSpawner.class, (w) -> new EntityMinecartMobSpawner(w),
+		addMapping(EntityMinecartMobSpawner.class, EntityMinecartMobSpawner::new,
 				EntityMinecart.EnumMinecartType.SPAWNER.getName(), 47);
-		addMapping(EntityMinecartCommandBlock.class, (w) -> new EntityMinecartCommandBlock(w),
+		addMapping(EntityMinecartCommandBlock.class, EntityMinecartCommandBlock::new,
 				EntityMinecart.EnumMinecartType.COMMAND_BLOCK.getName(), 40);
 		addMapping(EntityLiving.class, null, "Mob", 48);
 		addMapping(EntityMob.class, null, "Monster", 49);
-		addMapping(EntityCreeper.class, (w) -> new EntityCreeper(w), "Creeper", 50, 894731, 0);
-		addMapping(EntitySkeleton.class, (w) -> new EntitySkeleton(w), "Skeleton", 51, 12698049, 4802889);
-		addMapping(EntitySpider.class, (w) -> new EntitySpider(w), "Spider", 52, 3419431, 11013646);
-		addMapping(EntityGiantZombie.class, (w) -> new EntityGiantZombie(w), "Giant", 53);
-		addMapping(EntityZombie.class, (w) -> new EntityZombie(w), "Zombie", 54, '\uafaf', 7969893);
-		addMapping(EntitySlime.class, (w) -> new EntitySlime(w), "Slime", 55, 5349438, 8306542);
-		addMapping(EntityGhast.class, (w) -> new EntityGhast(w), "Ghast", 56, 16382457, 12369084);
-		addMapping(EntityPigZombie.class, (w) -> new EntityPigZombie(w), "PigZombie", 57, 15373203, 5009705);
-		addMapping(EntityEnderman.class, (w) -> new EntityEnderman(w), "Enderman", 58, 1447446, 0);
-		addMapping(EntityCaveSpider.class, (w) -> new EntityCaveSpider(w), "CaveSpider", 59, 803406, 11013646);
-		addMapping(EntitySilverfish.class, (w) -> new EntitySilverfish(w), "Silverfish", 60, 7237230, 3158064);
-		addMapping(EntityBlaze.class, (w) -> new EntityBlaze(w), "Blaze", 61, 16167425, 16775294);
-		addMapping(EntityMagmaCube.class, (w) -> new EntityMagmaCube(w), "LavaSlime", 62, 3407872, 16579584);
-		addMapping(EntityDragon.class, (w) -> new EntityDragon(w), "EnderDragon", 63);
-		addMapping(EntityWither.class, (w) -> new EntityWither(w), "WitherBoss", 64);
-		addMapping(EntityBat.class, (w) -> new EntityBat(w), "Bat", 65, 4996656, 986895);
-		addMapping(EntityWitch.class, (w) -> new EntityWitch(w), "Witch", 66, 3407872, 5349438);
-		addMapping(EntityEndermite.class, (w) -> new EntityEndermite(w), "Endermite", 67, 1447446, 7237230);
-		addMapping(EntityGuardian.class, (w) -> new EntityGuardian(w), "Guardian", 68, 5931634, 15826224);
-		addMapping(EntityPig.class, (w) -> new EntityPig(w), "Pig", 90, 15771042, 14377823);
-		addMapping(EntitySheep.class, (w) -> new EntitySheep(w), "Sheep", 91, 15198183, 16758197);
-		addMapping(EntityCow.class, (w) -> new EntityCow(w), "Cow", 92, 4470310, 10592673);
-		addMapping(EntityChicken.class, (w) -> new EntityChicken(w), "Chicken", 93, 10592673, 16711680);
-		addMapping(EntitySquid.class, (w) -> new EntitySquid(w), "Squid", 94, 2243405, 7375001);
-		addMapping(EntityWolf.class, (w) -> new EntityWolf(w), "Wolf", 95, 14144467, 13545366);
-		addMapping(EntityMooshroom.class, (w) -> new EntityMooshroom(w), "MushroomCow", 96, 10489616, 12040119);
-		addMapping(EntitySnowman.class, (w) -> new EntitySnowman(w), "SnowMan", 97);
-		addMapping(EntityOcelot.class, (w) -> new EntityOcelot(w), "Ozelot", 98, 15720061, 5653556);
-		addMapping(EntityIronGolem.class, (w) -> new EntityIronGolem(w), "VillagerGolem", 99);
-		addMapping(EntityHorse.class, (w) -> new EntityHorse(w), "EntityHorse", 100, 12623485, 15656192);
-		addMapping(EntityRabbit.class, (w) -> new EntityRabbit(w), "Rabbit", 101, 10051392, 7555121);
-		addMapping(EntityVillager.class, (w) -> new EntityVillager(w), "Villager", 120, 5651507, 12422002);
-		addMapping(EntityEnderCrystal.class, (w) -> new EntityEnderCrystal(w), "EnderCrystal", 200);
+		addMapping(EntityCreeper.class, EntityCreeper::new, "Creeper", 50, 894731, 0);
+		addMapping(EntitySkeleton.class, EntitySkeleton::new, "Skeleton", 51, 12698049, 4802889);
+		addMapping(EntitySpider.class, EntitySpider::new, "Spider", 52, 3419431, 11013646);
+		addMapping(EntityGiantZombie.class, EntityGiantZombie::new, "Giant", 53);
+		addMapping(EntityZombie.class, EntityZombie::new, "Zombie", 54, '\uafaf', 7969893);
+		addMapping(EntitySlime.class, EntitySlime::new, "Slime", 55, 5349438, 8306542);
+		addMapping(EntityGhast.class, EntityGhast::new, "Ghast", 56, 16382457, 12369084);
+		addMapping(EntityPigZombie.class, EntityPigZombie::new, "PigZombie", 57, 15373203, 5009705);
+		addMapping(EntityEnderman.class, EntityEnderman::new, "Enderman", 58, 1447446, 0);
+		addMapping(EntityCaveSpider.class, EntityCaveSpider::new, "CaveSpider", 59, 803406, 11013646);
+		addMapping(EntitySilverfish.class, EntitySilverfish::new, "Silverfish", 60, 7237230, 3158064);
+		addMapping(EntityBlaze.class, EntityBlaze::new, "Blaze", 61, 16167425, 16775294);
+		addMapping(EntityMagmaCube.class, EntityMagmaCube::new, "LavaSlime", 62, 3407872, 16579584);
+		addMapping(EntityDragon.class, EntityDragon::new, "EnderDragon", 63);
+		addMapping(EntityWither.class, EntityWither::new, "WitherBoss", 64);
+		addMapping(EntityBat.class, EntityBat::new, "Bat", 65, 4996656, 986895);
+		addMapping(EntityWitch.class, EntityWitch::new, "Witch", 66, 3407872, 5349438);
+		addMapping(EntityEndermite.class, EntityEndermite::new, "Endermite", 67, 1447446, 7237230);
+		addMapping(EntityGuardian.class, EntityGuardian::new, "Guardian", 68, 5931634, 15826224);
+		addMapping(EntityPig.class, EntityPig::new, "Pig", 90, 15771042, 14377823);
+		addMapping(EntitySheep.class, EntitySheep::new, "Sheep", 91, 15198183, 16758197);
+		addMapping(EntityCow.class, EntityCow::new, "Cow", 92, 4470310, 10592673);
+		addMapping(EntityChicken.class, EntityChicken::new, "Chicken", 93, 10592673, 16711680);
+		addMapping(EntitySquid.class, EntitySquid::new, "Squid", 94, 2243405, 7375001);
+		addMapping(EntityWolf.class, EntityWolf::new, "Wolf", 95, 14144467, 13545366);
+		addMapping(EntityMooshroom.class, EntityMooshroom::new, "MushroomCow", 96, 10489616, 12040119);
+		addMapping(EntitySnowman.class, EntitySnowman::new, "SnowMan", 97);
+		addMapping(EntityOcelot.class, EntityOcelot::new, "Ozelot", 98, 15720061, 5653556);
+		addMapping(EntityIronGolem.class, EntityIronGolem::new, "VillagerGolem", 99);
+		addMapping(EntityHorse.class, EntityHorse::new, "EntityHorse", 100, 12623485, 15656192);
+		addMapping(EntityRabbit.class, EntityRabbit::new, "Rabbit", 101, 10051392, 7555121);
+		addMapping(EntityVillager.class, EntityVillager::new, "Villager", 120, 5651507, 12422002);
+		addMapping(EntityEnderCrystal.class, EntityEnderCrystal::new, "EnderCrystal", 200);
 	}
 
 	public static class EntityEggInfo {
diff --git a/src/main/java/net/minecraft/entity/EntityLiving.java b/src/main/java/net/minecraft/entity/EntityLiving.java
index 36b02ad..1b1cbd3 100755
--- a/src/main/java/net/minecraft/entity/EntityLiving.java
+++ b/src/main/java/net/minecraft/entity/EntityLiving.java
@@ -1,5 +1,7 @@
 package net.minecraft.entity;
 
+import java.util.List;
+
 import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.ai.EntityAITasks;
@@ -407,8 +409,10 @@ public abstract class EntityLiving extends EntityLivingBase {
 		this.worldObj.theProfiler.startSection("looting");
 		if (!this.worldObj.isRemote && this.canPickUpLoot() && !this.dead
 				&& this.worldObj.getGameRules().getBoolean("mobGriefing")) {
-			for (EntityItem entityitem : this.worldObj.getEntitiesWithinAABB(EntityItem.class,
-					this.getEntityBoundingBox().expand(1.0D, 0.0D, 1.0D))) {
+			List<EntityItem> lst = this.worldObj.getEntitiesWithinAABB(EntityItem.class,
+					this.getEntityBoundingBox().expand(1.0D, 0.0D, 1.0D));
+			for (int i = 0, l = lst.size(); i < l; ++i) {
+				EntityItem entityitem = lst.get(i);
 				if (!entityitem.isDead && entityitem.getEntityItem() != null && !entityitem.cannotPickup()) {
 					this.updateEquipmentIfNeeded(entityitem);
 				}
@@ -1012,8 +1016,10 @@ public abstract class EntityLiving extends EntityLivingBase {
 				EaglercraftUUID uuid = new EaglercraftUUID(this.leashNBTTag.getLong("UUIDMost"),
 						this.leashNBTTag.getLong("UUIDLeast"));
 
-				for (EntityLivingBase entitylivingbase : this.worldObj.getEntitiesWithinAABB(EntityLivingBase.class,
-						this.getEntityBoundingBox().expand(10.0D, 10.0D, 10.0D))) {
+				List<EntityLivingBase> entities = this.worldObj.getEntitiesWithinAABB(EntityLivingBase.class,
+						this.getEntityBoundingBox().expand(10.0D, 10.0D, 10.0D));
+				for (int i = 0, l = entities.size(); i < l; ++i) {
+					EntityLivingBase entitylivingbase = entities.get(i);
 					if (entitylivingbase.getUniqueID().equals(uuid)) {
 						this.leashedToEntity = entitylivingbase;
 						break;
diff --git a/src/main/java/net/minecraft/entity/EntityLivingBase.java b/src/main/java/net/minecraft/entity/EntityLivingBase.java
index bce18cd..6dcd100 100755
--- a/src/main/java/net/minecraft/entity/EntityLivingBase.java
+++ b/src/main/java/net/minecraft/entity/EntityLivingBase.java
@@ -430,7 +430,9 @@ public abstract class EntityLivingBase extends Entity {
 		nbttagcompound.setShort("DeathTime", (short) this.deathTime);
 		nbttagcompound.setFloat("AbsorptionAmount", this.getAbsorptionAmount());
 
-		for (ItemStack itemstack : this.getInventory()) {
+		ItemStack[] inv = this.getInventory();
+		for (int i = 0; i < inv.length; ++i) {
+			ItemStack itemstack = inv[i];
 			if (itemstack != null) {
 				this.attributeMap.removeAttributeModifiers(itemstack.getAttributeModifiers());
 			}
@@ -438,7 +440,8 @@ public abstract class EntityLivingBase extends Entity {
 
 		nbttagcompound.setTag("Attributes", SharedMonsterAttributes.writeBaseAttributeMapToNBT(this.getAttributeMap()));
 
-		for (ItemStack itemstack1 : this.getInventory()) {
+		for (int i = 0; i < inv.length; ++i) {
+			ItemStack itemstack1 = inv[i];
 			if (itemstack1 != null) {
 				this.attributeMap.applyAttributeModifiers(itemstack1.getAttributeModifiers());
 			}
diff --git a/src/main/java/net/minecraft/entity/EntityTracker.java b/src/main/java/net/minecraft/entity/EntityTracker.java
index 47b7ae2..f4d0cc6 100755
--- a/src/main/java/net/minecraft/entity/EntityTracker.java
+++ b/src/main/java/net/minecraft/entity/EntityTracker.java
@@ -7,9 +7,6 @@ import java.util.Set;
 import java.util.concurrent.Callable;
 import net.minecraft.crash.CrashReport;
 import net.minecraft.crash.CrashReportCategory;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityHanging;
-import net.minecraft.entity.EntityTrackerEntry;
 import net.minecraft.entity.boss.EntityDragon;
 import net.minecraft.entity.boss.EntityWither;
 import net.minecraft.entity.item.EntityArmorStand;
@@ -64,7 +61,6 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
  * 
  */
 public class EntityTracker {
-
 	private static final Logger logger = LogManager.getLogger();
 	private final WorldServer theWorld;
 	/**+
diff --git a/src/main/java/net/minecraft/entity/EntityTrackerEntry.java b/src/main/java/net/minecraft/entity/EntityTrackerEntry.java
index e8f723a..dd7e2cc 100755
--- a/src/main/java/net/minecraft/entity/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/entity/EntityTrackerEntry.java
@@ -5,11 +5,6 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import net.minecraft.block.Block;
-import net.minecraft.entity.DataWatcher;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLeashKnot;
-import net.minecraft.entity.EntityLiving;
-import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.ai.attributes.ServersideAttributeMap;
 import net.minecraft.entity.item.EntityArmorStand;
 import net.minecraft.entity.item.EntityBoat;
@@ -85,7 +80,6 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
  * 
  */
 public class EntityTrackerEntry {
-
 	private static final Logger logger = LogManager.getLogger();
 	public Entity trackedEntity;
 	public int trackingDistanceThreshold;
@@ -166,8 +160,8 @@ public class EntityTrackerEntry {
 			if (itemstack != null && itemstack.getItem() instanceof ItemMap) {
 				MapData mapdata = Items.filled_map.getMapData(itemstack, this.trackedEntity.worldObj);
 
-				for (EntityPlayer entityplayer : parList) {
-					EntityPlayerMP entityplayermp = (EntityPlayerMP) entityplayer;
+				for (int i = 0, l = parList.size(); i < l; ++i) {
+					EntityPlayerMP entityplayermp = (EntityPlayerMP) parList.get(i);
 					mapdata.updateVisiblePlayers(entityplayermp, itemstack);
 					Packet packet = Items.filled_map.createMapDataPacket(itemstack, this.trackedEntity.worldObj,
 							entityplayermp);
diff --git a/src/main/java/net/minecraft/entity/EnumCreatureType.java b/src/main/java/net/minecraft/entity/EnumCreatureType.java
index e92d18a..37f92b6 100755
--- a/src/main/java/net/minecraft/entity/EnumCreatureType.java
+++ b/src/main/java/net/minecraft/entity/EnumCreatureType.java
@@ -32,6 +32,8 @@ public enum EnumCreatureType {
 	AMBIENT(EntityAmbientCreature.class, 15, Material.air, true, false),
 	WATER_CREATURE(EntityWaterMob.class, 5, Material.water, true, false);
 
+	public static final EnumCreatureType[] _VALUES = values();
+
 	private final Class<? extends IAnimals> creatureClass;
 	private final int maxNumberOfCreature;
 	private final Material creatureMaterial;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIArrowAttack.java b/src/main/java/net/minecraft/entity/ai/EntityAIArrowAttack.java
index 9d8b886..f23ac1d 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIArrowAttack.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIArrowAttack.java
@@ -3,7 +3,6 @@ package net.minecraft.entity.ai;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.IRangedAttackMob;
-import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.util.MathHelper;
 
 /**+
@@ -27,7 +26,6 @@ import net.minecraft.util.MathHelper;
  * 
  */
 public class EntityAIArrowAttack extends EntityAIBase {
-
 	private final EntityLiving entityHost;
 	private final IRangedAttackMob rangedAttackEntityHost;
 	private EntityLivingBase attackTarget;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIAttackOnCollide.java b/src/main/java/net/minecraft/entity/ai/EntityAIAttackOnCollide.java
index f9cc742..97a8b0e 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIAttackOnCollide.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIAttackOnCollide.java
@@ -3,7 +3,6 @@ package net.minecraft.entity.ai;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityCreature;
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.pathfinding.PathEntity;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
@@ -29,7 +28,6 @@ import net.minecraft.world.World;
  * 
  */
 public class EntityAIAttackOnCollide extends EntityAIBase {
-
 	World worldObj;
 	protected EntityCreature attacker;
 	int attackTick;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIAvoidEntity.java b/src/main/java/net/minecraft/entity/ai/EntityAIAvoidEntity.java
index a45e72a..6795082 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIAvoidEntity.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIAvoidEntity.java
@@ -5,8 +5,6 @@ import com.google.common.base.Predicates;
 import java.util.List;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityCreature;
-import net.minecraft.entity.ai.EntityAIBase;
-import net.minecraft.entity.ai.RandomPositionGenerator;
 import net.minecraft.pathfinding.PathEntity;
 import net.minecraft.pathfinding.PathNavigate;
 import net.minecraft.util.EntitySelectors;
@@ -33,7 +31,6 @@ import net.minecraft.util.Vec3;
  * 
  */
 public class EntityAIAvoidEntity<T extends Entity> extends EntityAIBase {
-
 	private final Predicate<Entity> canBeSeenSelector;
 	protected EntityCreature theEntity;
 	private double farSpeed;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIBase.java b/src/main/java/net/minecraft/entity/ai/EntityAIBase.java
index a4ae87d..d9f6c2c 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIBase.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIBase.java
@@ -21,7 +21,6 @@ package net.minecraft.entity.ai;
  * 
  */
 public abstract class EntityAIBase {
-
 	private int mutexBits;
 
 	public abstract boolean shouldExecute();
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIBeg.java b/src/main/java/net/minecraft/entity/ai/EntityAIBeg.java
index 43c2911..df94cc6 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIBeg.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIBeg.java
@@ -1,6 +1,5 @@
 package net.minecraft.entity.ai;
 
-import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.entity.passive.EntityWolf;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Items;
@@ -28,7 +27,6 @@ import net.minecraft.world.World;
  * 
  */
 public class EntityAIBeg extends EntityAIBase {
-
 	private EntityWolf theWolf;
 	private EntityPlayer thePlayer;
 	private World worldObject;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIBreakDoor.java b/src/main/java/net/minecraft/entity/ai/EntityAIBreakDoor.java
index 5101577..80ba3a6 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIBreakDoor.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIBreakDoor.java
@@ -3,7 +3,6 @@ package net.minecraft.entity.ai;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockDoor;
 import net.minecraft.entity.EntityLiving;
-import net.minecraft.entity.ai.EntityAIDoorInteract;
 import net.minecraft.world.EnumDifficulty;
 
 /**+
@@ -27,7 +26,6 @@ import net.minecraft.world.EnumDifficulty;
  * 
  */
 public class EntityAIBreakDoor extends EntityAIDoorInteract {
-
 	private int breakingTime;
 	private int previousBreakProgress = -1;
 
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIControlledByPlayer.java b/src/main/java/net/minecraft/entity/ai/EntityAIControlledByPlayer.java
index 5167ee6..1e12849 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIControlledByPlayer.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIControlledByPlayer.java
@@ -6,7 +6,6 @@ import net.minecraft.block.BlockStairs;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.EntityCreature;
 import net.minecraft.entity.EntityLiving;
-import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
@@ -35,7 +34,6 @@ import net.minecraft.world.pathfinder.WalkNodeProcessor;
  * 
  */
 public class EntityAIControlledByPlayer extends EntityAIBase {
-
 	private final EntityLiving thisEntity;
 	private final float maxSpeed;
 	private float currentSpeed;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAICreeperSwell.java b/src/main/java/net/minecraft/entity/ai/EntityAICreeperSwell.java
index c494dc8..d9f01f1 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAICreeperSwell.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAICreeperSwell.java
@@ -1,7 +1,6 @@
 package net.minecraft.entity.ai;
 
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.entity.monster.EntityCreeper;
 
 /**+
@@ -25,7 +24,6 @@ import net.minecraft.entity.monster.EntityCreeper;
  * 
  */
 public class EntityAICreeperSwell extends EntityAIBase {
-
 	EntityCreeper swellingCreeper;
 	EntityLivingBase creeperAttackTarget;
 
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIDefendVillage.java b/src/main/java/net/minecraft/entity/ai/EntityAIDefendVillage.java
index d93ef56..adb084f 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIDefendVillage.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIDefendVillage.java
@@ -1,7 +1,6 @@
 package net.minecraft.entity.ai;
 
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.ai.EntityAITarget;
 import net.minecraft.entity.monster.EntityCreeper;
 import net.minecraft.entity.monster.EntityIronGolem;
 import net.minecraft.village.Village;
@@ -27,7 +26,6 @@ import net.minecraft.village.Village;
  * 
  */
 public class EntityAIDefendVillage extends EntityAITarget {
-
 	EntityIronGolem irongolem;
 	EntityLivingBase villageAgressorTarget;
 
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIDoorInteract.java b/src/main/java/net/minecraft/entity/ai/EntityAIDoorInteract.java
index efcfef6..a5c7268 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIDoorInteract.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIDoorInteract.java
@@ -4,7 +4,6 @@ import net.minecraft.block.Block;
 import net.minecraft.block.BlockDoor;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.EntityLiving;
-import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.pathfinding.PathEntity;
 import net.minecraft.pathfinding.PathNavigateGround;
 import net.minecraft.pathfinding.PathPoint;
@@ -31,7 +30,6 @@ import net.minecraft.util.BlockPos;
  * 
  */
 public abstract class EntityAIDoorInteract extends EntityAIBase {
-
 	protected EntityLiving theEntity;
 	protected BlockPos doorPosition = BlockPos.ORIGIN;
 	protected BlockDoor doorBlock;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIEatGrass.java b/src/main/java/net/minecraft/entity/ai/EntityAIEatGrass.java
index baab02a..0bf054c 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIEatGrass.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIEatGrass.java
@@ -7,7 +7,6 @@ import net.minecraft.block.BlockTallGrass;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.block.state.pattern.BlockStateHelper;
 import net.minecraft.entity.EntityLiving;
-import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
@@ -33,7 +32,6 @@ import net.minecraft.world.World;
  * 
  */
 public class EntityAIEatGrass extends EntityAIBase {
-
 	private static final Predicate<IBlockState> field_179505_b = BlockStateHelper.forBlock(Blocks.tallgrass)
 			.where(BlockTallGrass.TYPE, Predicates.equalTo(BlockTallGrass.EnumType.GRASS));
 	private EntityLiving grassEaterEntity;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIFindEntityNearest.java b/src/main/java/net/minecraft/entity/ai/EntityAIFindEntityNearest.java
index 9c7351c..3b8dc46 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIFindEntityNearest.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIFindEntityNearest.java
@@ -7,9 +7,6 @@ import net.minecraft.entity.EntityCreature;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.SharedMonsterAttributes;
-import net.minecraft.entity.ai.EntityAIBase;
-import net.minecraft.entity.ai.EntityAINearestAttackableTarget;
-import net.minecraft.entity.ai.EntityAITarget;
 import net.minecraft.entity.ai.attributes.IAttributeInstance;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
@@ -36,7 +33,6 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
  * 
  */
 public class EntityAIFindEntityNearest extends EntityAIBase {
-
 	private static final Logger field_179444_a = LogManager.getLogger();
 	private EntityLiving field_179442_b;
 	private final Predicate<EntityLivingBase> field_179443_c;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIFindEntityNearestPlayer.java b/src/main/java/net/minecraft/entity/ai/EntityAIFindEntityNearestPlayer.java
index 5e55903..b43b52f 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIFindEntityNearestPlayer.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIFindEntityNearestPlayer.java
@@ -8,9 +8,6 @@ import net.minecraft.entity.EntityCreature;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.SharedMonsterAttributes;
-import net.minecraft.entity.ai.EntityAIBase;
-import net.minecraft.entity.ai.EntityAINearestAttackableTarget;
-import net.minecraft.entity.ai.EntityAITarget;
 import net.minecraft.entity.ai.attributes.IAttributeInstance;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -39,7 +36,6 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
  * 
  */
 public class EntityAIFindEntityNearestPlayer extends EntityAIBase {
-
 	private static final Logger field_179436_a = LogManager.getLogger();
 	private EntityLiving field_179434_b;
 	private final Predicate<Entity> field_179435_c;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIFleeSun.java b/src/main/java/net/minecraft/entity/ai/EntityAIFleeSun.java
index 68fcc53..b0c51b1 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIFleeSun.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIFleeSun.java
@@ -2,7 +2,6 @@ package net.minecraft.entity.ai;
 
 import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 import net.minecraft.entity.EntityCreature;
-import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
@@ -28,7 +27,6 @@ import net.minecraft.world.World;
  * 
  */
 public class EntityAIFleeSun extends EntityAIBase {
-
 	private EntityCreature theCreature;
 	private double shelterX;
 	private double shelterY;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIFollowGolem.java b/src/main/java/net/minecraft/entity/ai/EntityAIFollowGolem.java
index 92ebb63..b4e6877 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIFollowGolem.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIFollowGolem.java
@@ -1,7 +1,6 @@
 package net.minecraft.entity.ai;
 
 import java.util.List;
-import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.entity.monster.EntityIronGolem;
 import net.minecraft.entity.passive.EntityVillager;
 
@@ -26,7 +25,6 @@ import net.minecraft.entity.passive.EntityVillager;
  * 
  */
 public class EntityAIFollowGolem extends EntityAIBase {
-
 	private EntityVillager theVillager;
 	private EntityIronGolem theGolem;
 	private int takeGolemRoseTick;
@@ -46,12 +44,13 @@ public class EntityAIFollowGolem extends EntityAIBase {
 		} else if (!this.theVillager.worldObj.isDaytime()) {
 			return false;
 		} else {
-			List list = this.theVillager.worldObj.getEntitiesWithinAABB(EntityIronGolem.class,
+			List<EntityIronGolem> list = this.theVillager.worldObj.getEntitiesWithinAABB(EntityIronGolem.class,
 					this.theVillager.getEntityBoundingBox().expand(6.0D, 2.0D, 6.0D));
 			if (list.isEmpty()) {
 				return false;
 			} else {
-				for (EntityIronGolem entityirongolem : (List<EntityIronGolem>) list) {
+				for (int i = 0, l = list.size(); i < l; ++i) {
+					EntityIronGolem entityirongolem = list.get(i);
 					if (entityirongolem.getHoldRoseTick() > 0) {
 						this.theGolem = entityirongolem;
 						break;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIFollowOwner.java b/src/main/java/net/minecraft/entity/ai/EntityAIFollowOwner.java
index e652cf7..07f0660 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIFollowOwner.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIFollowOwner.java
@@ -3,7 +3,6 @@ package net.minecraft.entity.ai;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.entity.passive.EntityTameable;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
@@ -34,7 +33,6 @@ import net.minecraft.world.World;
  * 
  */
 public class EntityAIFollowOwner extends EntityAIBase {
-
 	private EntityTameable thePet;
 	private EntityLivingBase theOwner;
 	World theWorld;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIFollowParent.java b/src/main/java/net/minecraft/entity/ai/EntityAIFollowParent.java
index 6acadd9..7b990e0 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIFollowParent.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIFollowParent.java
@@ -1,7 +1,6 @@
 package net.minecraft.entity.ai;
 
 import java.util.List;
-import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.entity.passive.EntityAnimal;
 
 /**+
@@ -25,7 +24,6 @@ import net.minecraft.entity.passive.EntityAnimal;
  * 
  */
 public class EntityAIFollowParent extends EntityAIBase {
-
 	EntityAnimal childAnimal;
 	EntityAnimal parentAnimal;
 	double moveSpeed;
@@ -43,12 +41,13 @@ public class EntityAIFollowParent extends EntityAIBase {
 		if (this.childAnimal.getGrowingAge() >= 0) {
 			return false;
 		} else {
-			List list = this.childAnimal.worldObj.getEntitiesWithinAABB(this.childAnimal.getClass(),
+			List<EntityAnimal> list = this.childAnimal.worldObj.getEntitiesWithinAABB(this.childAnimal.getClass(),
 					this.childAnimal.getEntityBoundingBox().expand(8.0D, 4.0D, 8.0D));
 			EntityAnimal entityanimal = null;
 			double d0 = Double.MAX_VALUE;
 
-			for (EntityAnimal entityanimal1 : (List<EntityAnimal>) list) {
+			for (int i = 0, l = list.size(); i < l; ++i) {
+				EntityAnimal entityanimal1 = list.get(i);
 				if (entityanimal1.getGrowingAge() >= 0) {
 					double d1 = this.childAnimal.getDistanceSqToEntity(entityanimal1);
 					if (d1 <= d0) {
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIHarvestFarmland.java b/src/main/java/net/minecraft/entity/ai/EntityAIHarvestFarmland.java
index a1b3aac..d6bb164 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIHarvestFarmland.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIHarvestFarmland.java
@@ -3,7 +3,6 @@ package net.minecraft.entity.ai;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockCrops;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.ai.EntityAIMoveToBlock;
 import net.minecraft.entity.passive.EntityVillager;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -33,7 +32,6 @@ import net.minecraft.world.World;
  * 
  */
 public class EntityAIHarvestFarmland extends EntityAIMoveToBlock {
-
 	private final EntityVillager theVillager;
 	private boolean hasFarmItem;
 	private boolean field_179503_e;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIHurtByTarget.java b/src/main/java/net/minecraft/entity/ai/EntityAIHurtByTarget.java
index d5997e8..2498cb7 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIHurtByTarget.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIHurtByTarget.java
@@ -1,8 +1,9 @@
 package net.minecraft.entity.ai;
 
+import java.util.List;
+
 import net.minecraft.entity.EntityCreature;
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.ai.EntityAITarget;
 import net.minecraft.util.AxisAlignedBB;
 
 /**+
@@ -26,7 +27,6 @@ import net.minecraft.util.AxisAlignedBB;
  * 
  */
 public class EntityAIHurtByTarget extends EntityAITarget {
-
 	private boolean entityCallsForHelp;
 	private int revengeTimerOld;
 	private final Class[] targetClasses;
@@ -55,17 +55,18 @@ public class EntityAIHurtByTarget extends EntityAITarget {
 		if (this.entityCallsForHelp) {
 			double d0 = this.getTargetDistance();
 
-			for (EntityCreature entitycreature : this.taskOwner.worldObj.getEntitiesWithinAABB(
-					this.taskOwner.getClass(),
+			List<EntityCreature> lst = this.taskOwner.worldObj.getEntitiesWithinAABB(this.taskOwner.getClass(),
 					(new AxisAlignedBB(this.taskOwner.posX, this.taskOwner.posY, this.taskOwner.posZ,
 							this.taskOwner.posX + 1.0D, this.taskOwner.posY + 1.0D, this.taskOwner.posZ + 1.0D))
-									.expand(d0, 10.0D, d0))) {
+									.expand(d0, 10.0D, d0));
+			for (int i = 0, l = lst.size(); i < l; ++i) {
+				EntityCreature entitycreature = lst.get(i);
 				if (this.taskOwner != entitycreature && entitycreature.getAttackTarget() == null
 						&& !entitycreature.isOnSameTeam(this.taskOwner.getAITarget())) {
 					boolean flag = false;
 
-					for (Class oclass : this.targetClasses) {
-						if (entitycreature.getClass() == oclass) {
+					for (int j = 0; j < this.targetClasses.length; ++j) {
+						if (entitycreature.getClass() == this.targetClasses[j]) {
 							flag = true;
 							break;
 						}
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAILeapAtTarget.java b/src/main/java/net/minecraft/entity/ai/EntityAILeapAtTarget.java
index 8ad0683..695cdd8 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAILeapAtTarget.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAILeapAtTarget.java
@@ -2,7 +2,6 @@ package net.minecraft.entity.ai;
 
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.util.MathHelper;
 
 /**+
@@ -26,7 +25,6 @@ import net.minecraft.util.MathHelper;
  * 
  */
 public class EntityAILeapAtTarget extends EntityAIBase {
-
 	EntityLiving leaper;
 	EntityLivingBase leapTarget;
 	float leapMotionY;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAILookAtTradePlayer.java b/src/main/java/net/minecraft/entity/ai/EntityAILookAtTradePlayer.java
index ed6d86c..ed60bde 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAILookAtTradePlayer.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAILookAtTradePlayer.java
@@ -1,6 +1,5 @@
 package net.minecraft.entity.ai;
 
-import net.minecraft.entity.ai.EntityAIWatchClosest;
 import net.minecraft.entity.passive.EntityVillager;
 import net.minecraft.entity.player.EntityPlayer;
 
@@ -25,7 +24,6 @@ import net.minecraft.entity.player.EntityPlayer;
  * 
  */
 public class EntityAILookAtTradePlayer extends EntityAIWatchClosest {
-
 	private final EntityVillager theMerchant;
 
 	public EntityAILookAtTradePlayer(EntityVillager theMerchantIn) {
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAILookAtVillager.java b/src/main/java/net/minecraft/entity/ai/EntityAILookAtVillager.java
index f7080dd..d68ab45 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAILookAtVillager.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAILookAtVillager.java
@@ -1,6 +1,5 @@
 package net.minecraft.entity.ai;
 
-import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.entity.monster.EntityIronGolem;
 import net.minecraft.entity.passive.EntityVillager;
 
@@ -25,7 +24,6 @@ import net.minecraft.entity.passive.EntityVillager;
  * 
  */
 public class EntityAILookAtVillager extends EntityAIBase {
-
 	private EntityIronGolem theGolem;
 	private EntityVillager theVillager;
 	private int lookTime;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAILookIdle.java b/src/main/java/net/minecraft/entity/ai/EntityAILookIdle.java
index fcb068c..6ffd051 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAILookIdle.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAILookIdle.java
@@ -1,7 +1,6 @@
 package net.minecraft.entity.ai;
 
 import net.minecraft.entity.EntityLiving;
-import net.minecraft.entity.ai.EntityAIBase;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -24,7 +23,6 @@ import net.minecraft.entity.ai.EntityAIBase;
  * 
  */
 public class EntityAILookIdle extends EntityAIBase {
-
 	private EntityLiving idleEntity;
 	private double lookX;
 	private double lookZ;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIMate.java b/src/main/java/net/minecraft/entity/ai/EntityAIMate.java
index 5e50139..8b85b0e 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIMate.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIMate.java
@@ -3,7 +3,6 @@ package net.minecraft.entity.ai;
 import java.util.List;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 import net.minecraft.entity.EntityAgeable;
-import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.entity.item.EntityXPOrb;
 import net.minecraft.entity.passive.EntityAnimal;
 import net.minecraft.entity.passive.EntityCow;
@@ -34,7 +33,6 @@ import net.minecraft.world.World;
  * 
  */
 public class EntityAIMate extends EntityAIBase {
-
 	private EntityAnimal theAnimal;
 	World theWorld;
 	private EntityAnimal targetMate;
@@ -97,12 +95,13 @@ public class EntityAIMate extends EntityAIBase {
 	 */
 	private EntityAnimal getNearbyMate() {
 		float f = 8.0F;
-		List list = this.theWorld.getEntitiesWithinAABB(this.theAnimal.getClass(),
+		List<EntityAnimal> list = this.theWorld.getEntitiesWithinAABB(this.theAnimal.getClass(),
 				this.theAnimal.getEntityBoundingBox().expand((double) f, (double) f, (double) f));
 		double d0 = Double.MAX_VALUE;
 		EntityAnimal entityanimal = null;
 
-		for (EntityAnimal entityanimal1 : (List<EntityAnimal>) list) {
+		for (int i = 0, l = list.size(); i < l; ++i) {
+			EntityAnimal entityanimal1 = list.get(i);
 			if (this.theAnimal.canMateWith(entityanimal1) && this.theAnimal.getDistanceSqToEntity(entityanimal1) < d0) {
 				entityanimal = entityanimal1;
 				d0 = this.theAnimal.getDistanceSqToEntity(entityanimal1);
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIMoveIndoors.java b/src/main/java/net/minecraft/entity/ai/EntityAIMoveIndoors.java
index 4db5fb6..b55d695 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIMoveIndoors.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIMoveIndoors.java
@@ -1,8 +1,6 @@
 package net.minecraft.entity.ai;
 
 import net.minecraft.entity.EntityCreature;
-import net.minecraft.entity.ai.EntityAIBase;
-import net.minecraft.entity.ai.RandomPositionGenerator;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.Vec3;
 import net.minecraft.village.Village;
@@ -29,7 +27,6 @@ import net.minecraft.village.VillageDoorInfo;
  * 
  */
 public class EntityAIMoveIndoors extends EntityAIBase {
-
 	private EntityCreature entityObj;
 	private VillageDoorInfo doorInfo;
 	private int insidePosX = -1;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIMoveThroughVillage.java b/src/main/java/net/minecraft/entity/ai/EntityAIMoveThroughVillage.java
index e878b55..1fe2dc9 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIMoveThroughVillage.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIMoveThroughVillage.java
@@ -3,8 +3,6 @@ package net.minecraft.entity.ai;
 import com.google.common.collect.Lists;
 import java.util.List;
 import net.minecraft.entity.EntityCreature;
-import net.minecraft.entity.ai.EntityAIBase;
-import net.minecraft.entity.ai.RandomPositionGenerator;
 import net.minecraft.pathfinding.PathEntity;
 import net.minecraft.pathfinding.PathNavigateGround;
 import net.minecraft.util.BlockPos;
@@ -34,7 +32,6 @@ import net.minecraft.village.VillageDoorInfo;
  * 
  */
 public class EntityAIMoveThroughVillage extends EntityAIBase {
-
 	private EntityCreature theEntity;
 	private double movementSpeed;
 	private PathEntity entityPathNavigate;
@@ -131,7 +128,9 @@ public class EntityAIMoveThroughVillage extends EntityAIBase {
 		VillageDoorInfo villagedoorinfo = null;
 		int i = Integer.MAX_VALUE;
 
-		for (VillageDoorInfo villagedoorinfo1 : villageIn.getVillageDoorInfoList()) {
+		List<VillageDoorInfo> lst = villageIn.getVillageDoorInfoList();
+		for (int k = 0, l = lst.size(); k < l; ++k) {
+			VillageDoorInfo villagedoorinfo1 = lst.get(k);
 			int j = villagedoorinfo1.getDistanceSquared(MathHelper.floor_double(this.theEntity.posX),
 					MathHelper.floor_double(this.theEntity.posY), MathHelper.floor_double(this.theEntity.posZ));
 			if (j < i && !this.doesDoorListContain(villagedoorinfo1)) {
@@ -144,7 +143,8 @@ public class EntityAIMoveThroughVillage extends EntityAIBase {
 	}
 
 	private boolean doesDoorListContain(VillageDoorInfo doorInfoIn) {
-		for (VillageDoorInfo villagedoorinfo : this.doorList) {
+		for (int i = 0, l = this.doorList.size(); i < l; ++i) {
+			VillageDoorInfo villagedoorinfo = this.doorList.get(i);
 			if (doorInfoIn.getDoorBlockPos().equals(villagedoorinfo.getDoorBlockPos())) {
 				return true;
 			}
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIMoveToBlock.java b/src/main/java/net/minecraft/entity/ai/EntityAIMoveToBlock.java
index 18ae6b3..5c4555b 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIMoveToBlock.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIMoveToBlock.java
@@ -1,7 +1,6 @@
 package net.minecraft.entity.ai;
 
 import net.minecraft.entity.EntityCreature;
-import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
 
@@ -26,7 +25,6 @@ import net.minecraft.world.World;
  * 
  */
 public abstract class EntityAIMoveToBlock extends EntityAIBase {
-
 	private final EntityCreature theEntity;
 	private final double movementSpeed;
 	protected int runDelay;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIMoveTowardsRestriction.java b/src/main/java/net/minecraft/entity/ai/EntityAIMoveTowardsRestriction.java
index d28e996..5060779 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIMoveTowardsRestriction.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIMoveTowardsRestriction.java
@@ -1,8 +1,6 @@
 package net.minecraft.entity.ai;
 
 import net.minecraft.entity.EntityCreature;
-import net.minecraft.entity.ai.EntityAIBase;
-import net.minecraft.entity.ai.RandomPositionGenerator;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.Vec3;
 
@@ -27,7 +25,6 @@ import net.minecraft.util.Vec3;
  * 
  */
 public class EntityAIMoveTowardsRestriction extends EntityAIBase {
-
 	private EntityCreature theEntity;
 	private double movePosX;
 	private double movePosY;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIMoveTowardsTarget.java b/src/main/java/net/minecraft/entity/ai/EntityAIMoveTowardsTarget.java
index 8e9a1c5..7687d5c 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIMoveTowardsTarget.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIMoveTowardsTarget.java
@@ -2,8 +2,6 @@ package net.minecraft.entity.ai;
 
 import net.minecraft.entity.EntityCreature;
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.ai.EntityAIBase;
-import net.minecraft.entity.ai.RandomPositionGenerator;
 import net.minecraft.util.Vec3;
 
 /**+
@@ -27,7 +25,6 @@ import net.minecraft.util.Vec3;
  * 
  */
 public class EntityAIMoveTowardsTarget extends EntityAIBase {
-
 	private EntityCreature theEntity;
 	private EntityLivingBase targetEntity;
 	private double movePosX;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAINearestAttackableTarget.java b/src/main/java/net/minecraft/entity/ai/EntityAINearestAttackableTarget.java
index dc83dd5..1dc84c6 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAINearestAttackableTarget.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAINearestAttackableTarget.java
@@ -8,7 +8,6 @@ import java.util.List;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityCreature;
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.ai.EntityAITarget;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.EntitySelectors;
 
@@ -33,7 +32,6 @@ import net.minecraft.util.EntitySelectors;
  * 
  */
 public class EntityAINearestAttackableTarget<T extends EntityLivingBase> extends EntityAITarget {
-
 	protected final Class<T> targetClass;
 	private final int targetChance;
 	protected final EntityAINearestAttackableTarget.Sorter theNearestAttackableTargetSorter;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIOcelotAttack.java b/src/main/java/net/minecraft/entity/ai/EntityAIOcelotAttack.java
index 324e77b..59e1707 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIOcelotAttack.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIOcelotAttack.java
@@ -2,7 +2,6 @@ package net.minecraft.entity.ai;
 
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.world.World;
 
 /**+
@@ -26,7 +25,6 @@ import net.minecraft.world.World;
  * 
  */
 public class EntityAIOcelotAttack extends EntityAIBase {
-
 	World theWorld;
 	EntityLiving theEntity;
 	EntityLivingBase theVictim;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIOcelotSit.java b/src/main/java/net/minecraft/entity/ai/EntityAIOcelotSit.java
index 332e093..0fb7cd7 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIOcelotSit.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIOcelotSit.java
@@ -3,7 +3,6 @@ package net.minecraft.entity.ai;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockBed;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.ai.EntityAIMoveToBlock;
 import net.minecraft.entity.passive.EntityOcelot;
 import net.minecraft.init.Blocks;
 import net.minecraft.tileentity.TileEntity;
@@ -32,7 +31,6 @@ import net.minecraft.world.World;
  * 
  */
 public class EntityAIOcelotSit extends EntityAIMoveToBlock {
-
 	private final EntityOcelot field_151493_a;
 
 	public EntityAIOcelotSit(EntityOcelot parEntityOcelot, double parDouble1) {
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIOpenDoor.java b/src/main/java/net/minecraft/entity/ai/EntityAIOpenDoor.java
index 56f424a..af197f0 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIOpenDoor.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIOpenDoor.java
@@ -1,7 +1,6 @@
 package net.minecraft.entity.ai;
 
 import net.minecraft.entity.EntityLiving;
-import net.minecraft.entity.ai.EntityAIDoorInteract;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -24,7 +23,6 @@ import net.minecraft.entity.ai.EntityAIDoorInteract;
  * 
  */
 public class EntityAIOpenDoor extends EntityAIDoorInteract {
-
 	boolean closeDoor;
 	int closeDoorTemporisation;
 
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIOwnerHurtByTarget.java b/src/main/java/net/minecraft/entity/ai/EntityAIOwnerHurtByTarget.java
index 270dbff..5bd52e9 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIOwnerHurtByTarget.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIOwnerHurtByTarget.java
@@ -1,7 +1,6 @@
 package net.minecraft.entity.ai;
 
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.ai.EntityAITarget;
 import net.minecraft.entity.passive.EntityTameable;
 
 /**+
@@ -25,7 +24,6 @@ import net.minecraft.entity.passive.EntityTameable;
  * 
  */
 public class EntityAIOwnerHurtByTarget extends EntityAITarget {
-
 	EntityTameable theDefendingTameable;
 	EntityLivingBase theOwnerAttacker;
 	private int field_142051_e;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIOwnerHurtTarget.java b/src/main/java/net/minecraft/entity/ai/EntityAIOwnerHurtTarget.java
index 6a69d54..d488768 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIOwnerHurtTarget.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIOwnerHurtTarget.java
@@ -1,7 +1,6 @@
 package net.minecraft.entity.ai;
 
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.ai.EntityAITarget;
 import net.minecraft.entity.passive.EntityTameable;
 
 /**+
@@ -25,7 +24,6 @@ import net.minecraft.entity.passive.EntityTameable;
  * 
  */
 public class EntityAIOwnerHurtTarget extends EntityAITarget {
-
 	EntityTameable theEntityTameable;
 	EntityLivingBase theTarget;
 	private int field_142050_e;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIPanic.java b/src/main/java/net/minecraft/entity/ai/EntityAIPanic.java
index 22c575b..5c48292 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIPanic.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIPanic.java
@@ -1,8 +1,6 @@
 package net.minecraft.entity.ai;
 
 import net.minecraft.entity.EntityCreature;
-import net.minecraft.entity.ai.EntityAIBase;
-import net.minecraft.entity.ai.RandomPositionGenerator;
 import net.minecraft.util.Vec3;
 
 /**+
@@ -26,7 +24,6 @@ import net.minecraft.util.Vec3;
  * 
  */
 public class EntityAIPanic extends EntityAIBase {
-
 	private EntityCreature theEntityCreature;
 	protected double speed;
 	private double randPosX;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIPlay.java b/src/main/java/net/minecraft/entity/ai/EntityAIPlay.java
index aa7b1d5..e85cbbe 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIPlay.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIPlay.java
@@ -2,8 +2,6 @@ package net.minecraft.entity.ai;
 
 import java.util.List;
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.ai.EntityAIBase;
-import net.minecraft.entity.ai.RandomPositionGenerator;
 import net.minecraft.entity.passive.EntityVillager;
 import net.minecraft.util.Vec3;
 
@@ -28,7 +26,6 @@ import net.minecraft.util.Vec3;
  * 
  */
 public class EntityAIPlay extends EntityAIBase {
-
 	private EntityVillager villagerObj;
 	private EntityLivingBase targetVillager;
 	private double speed;
@@ -49,11 +46,12 @@ public class EntityAIPlay extends EntityAIBase {
 		} else if (this.villagerObj.getRNG().nextInt(400) != 0) {
 			return false;
 		} else {
-			List list = this.villagerObj.worldObj.getEntitiesWithinAABB(EntityVillager.class,
+			List<EntityVillager> list = this.villagerObj.worldObj.getEntitiesWithinAABB(EntityVillager.class,
 					this.villagerObj.getEntityBoundingBox().expand(6.0D, 3.0D, 6.0D));
 			double d0 = Double.MAX_VALUE;
 
-			for (EntityVillager entityvillager : (List<EntityVillager>) list) {
+			for (int i = 0, l = list.size(); i < l; ++i) {
+				EntityVillager entityvillager = list.get(i);
 				if (entityvillager != this.villagerObj && !entityvillager.isPlaying()
 						&& entityvillager.getGrowingAge() < 0) {
 					double d1 = entityvillager.getDistanceSqToEntity(this.villagerObj);
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIRestrictOpenDoor.java b/src/main/java/net/minecraft/entity/ai/EntityAIRestrictOpenDoor.java
index 1d3945e..abf2757 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIRestrictOpenDoor.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIRestrictOpenDoor.java
@@ -1,7 +1,6 @@
 package net.minecraft.entity.ai;
 
 import net.minecraft.entity.EntityCreature;
-import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.pathfinding.PathNavigateGround;
 import net.minecraft.util.BlockPos;
 import net.minecraft.village.Village;
@@ -28,7 +27,6 @@ import net.minecraft.village.VillageDoorInfo;
  * 
  */
 public class EntityAIRestrictOpenDoor extends EntityAIBase {
-
 	private EntityCreature entityObj;
 	private VillageDoorInfo frontDoor;
 
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIRestrictSun.java b/src/main/java/net/minecraft/entity/ai/EntityAIRestrictSun.java
index 10faca0..a1ea8d2 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIRestrictSun.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIRestrictSun.java
@@ -1,7 +1,6 @@
 package net.minecraft.entity.ai;
 
 import net.minecraft.entity.EntityCreature;
-import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.pathfinding.PathNavigateGround;
 
 /**+
@@ -25,7 +24,6 @@ import net.minecraft.pathfinding.PathNavigateGround;
  * 
  */
 public class EntityAIRestrictSun extends EntityAIBase {
-
 	private EntityCreature theEntity;
 
 	public EntityAIRestrictSun(EntityCreature parEntityCreature) {
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java b/src/main/java/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java
index 506c9db..51d594d 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java
@@ -1,8 +1,6 @@
 package net.minecraft.entity.ai;
 
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.ai.EntityAIBase;
-import net.minecraft.entity.ai.RandomPositionGenerator;
 import net.minecraft.entity.passive.EntityHorse;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.Vec3;
@@ -28,7 +26,6 @@ import net.minecraft.util.Vec3;
  * 
  */
 public class EntityAIRunAroundLikeCrazy extends EntityAIBase {
-
 	private EntityHorse horseHost;
 	private double speed;
 	private double targetX;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAISit.java b/src/main/java/net/minecraft/entity/ai/EntityAISit.java
index 1e16b8a..0a8cdfc 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAISit.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAISit.java
@@ -1,7 +1,6 @@
 package net.minecraft.entity.ai;
 
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.entity.passive.EntityTameable;
 
 /**+
@@ -25,7 +24,6 @@ import net.minecraft.entity.passive.EntityTameable;
  * 
  */
 public class EntityAISit extends EntityAIBase {
-
 	private EntityTameable theEntity;
 	private boolean isSitting;
 
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAISwimming.java b/src/main/java/net/minecraft/entity/ai/EntityAISwimming.java
index aeff8fa..59640d8 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAISwimming.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAISwimming.java
@@ -1,7 +1,6 @@
 package net.minecraft.entity.ai;
 
 import net.minecraft.entity.EntityLiving;
-import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.pathfinding.PathNavigateGround;
 
 /**+
@@ -25,7 +24,6 @@ import net.minecraft.pathfinding.PathNavigateGround;
  * 
  */
 public class EntityAISwimming extends EntityAIBase {
-
 	private EntityLiving theEntity;
 
 	public EntityAISwimming(EntityLiving entitylivingIn) {
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAITarget.java b/src/main/java/net/minecraft/entity/ai/EntityAITarget.java
index aea3dd5..99a647d 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAITarget.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAITarget.java
@@ -5,7 +5,6 @@ import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.IEntityOwnable;
 import net.minecraft.entity.SharedMonsterAttributes;
-import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.entity.ai.attributes.IAttributeInstance;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.pathfinding.PathEntity;
@@ -37,7 +36,6 @@ import org.apache.commons.lang3.StringUtils;
  * 
  */
 public abstract class EntityAITarget extends EntityAIBase {
-
 	protected final EntityCreature taskOwner;
 	protected boolean shouldCheckSight;
 	private boolean nearbyOnly;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAITargetNonTamed.java b/src/main/java/net/minecraft/entity/ai/EntityAITargetNonTamed.java
index f1d6f83..123b8f9 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAITargetNonTamed.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAITargetNonTamed.java
@@ -2,7 +2,6 @@ package net.minecraft.entity.ai;
 
 import com.google.common.base.Predicate;
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.ai.EntityAINearestAttackableTarget;
 import net.minecraft.entity.passive.EntityTameable;
 
 /**+
@@ -26,7 +25,6 @@ import net.minecraft.entity.passive.EntityTameable;
  * 
  */
 public class EntityAITargetNonTamed<T extends EntityLivingBase> extends EntityAINearestAttackableTarget {
-
 	private EntityTameable theTameable;
 
 	public EntityAITargetNonTamed(EntityTameable entityIn, Class<T> classTarget, boolean checkSight,
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAITasks.java b/src/main/java/net/minecraft/entity/ai/EntityAITasks.java
index f2e2e19..6b6c831 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAITasks.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAITasks.java
@@ -3,7 +3,6 @@ package net.minecraft.entity.ai;
 import com.google.common.collect.Lists;
 import java.util.Iterator;
 import java.util.List;
-import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.profiler.Profiler;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
@@ -29,7 +28,6 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
  * 
  */
 public class EntityAITasks {
-
 	private static final Logger logger = LogManager.getLogger();
 	/**+
 	 * A list of EntityAITaskEntrys in EntityAITasks.
@@ -125,8 +123,8 @@ public class EntityAITasks {
 		this.theProfiler.endSection();
 		this.theProfiler.startSection("goalTick");
 
-		for (EntityAITasks.EntityAITaskEntry entityaitasks$entityaitaskentry2 : this.executingTaskEntries) {
-			entityaitasks$entityaitaskentry2.action.updateTask();
+		for (int i = 0, l = this.executingTaskEntries.size(); i < l; ++i) {
+			this.executingTaskEntries.get(i).action.updateTask();
 		}
 
 		this.theProfiler.endSection();
@@ -148,7 +146,8 @@ public class EntityAITasks {
 	 * interrupted.
 	 */
 	private boolean canUse(EntityAITasks.EntityAITaskEntry taskEntry) {
-		for (EntityAITasks.EntityAITaskEntry entityaitasks$entityaitaskentry : this.taskEntries) {
+		for (int i = 0, l = this.taskEntries.size(); i < l; ++i) {
+			EntityAITasks.EntityAITaskEntry entityaitasks$entityaitaskentry = this.taskEntries.get(i);
 			if (entityaitasks$entityaitaskentry != taskEntry) {
 				if (taskEntry.priority >= entityaitasks$entityaitaskentry.priority) {
 					if (!this.areTasksCompatible(taskEntry, entityaitasks$entityaitaskentry)
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAITempt.java b/src/main/java/net/minecraft/entity/ai/EntityAITempt.java
index ea9ec16..4401858 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAITempt.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAITempt.java
@@ -1,7 +1,6 @@
 package net.minecraft.entity.ai;
 
 import net.minecraft.entity.EntityCreature;
-import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -28,7 +27,6 @@ import net.minecraft.pathfinding.PathNavigateGround;
  * 
  */
 public class EntityAITempt extends EntityAIBase {
-
 	private EntityCreature temptedEntity;
 	private double speed;
 	private double targetX;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAITradePlayer.java b/src/main/java/net/minecraft/entity/ai/EntityAITradePlayer.java
index 2318cea..bc98b8f 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAITradePlayer.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAITradePlayer.java
@@ -1,6 +1,5 @@
 package net.minecraft.entity.ai;
 
-import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.entity.passive.EntityVillager;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
@@ -26,7 +25,6 @@ import net.minecraft.inventory.Container;
  * 
  */
 public class EntityAITradePlayer extends EntityAIBase {
-
 	private EntityVillager villager;
 
 	public EntityAITradePlayer(EntityVillager villagerIn) {
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIVillagerInteract.java b/src/main/java/net/minecraft/entity/ai/EntityAIVillagerInteract.java
index fdc0360..350edb3 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIVillagerInteract.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIVillagerInteract.java
@@ -1,6 +1,5 @@
 package net.minecraft.entity.ai;
 
-import net.minecraft.entity.ai.EntityAIWatchClosest2;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.passive.EntityVillager;
 import net.minecraft.init.Items;
@@ -30,7 +29,6 @@ import net.minecraft.util.MathHelper;
  * 
  */
 public class EntityAIVillagerInteract extends EntityAIWatchClosest2 {
-
 	private int interactionDelay;
 	private EntityVillager villager;
 
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIVillagerMate.java b/src/main/java/net/minecraft/entity/ai/EntityAIVillagerMate.java
index 8bc6d25..ea4622a 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIVillagerMate.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIVillagerMate.java
@@ -1,7 +1,6 @@
 package net.minecraft.entity.ai;
 
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.entity.passive.EntityVillager;
 import net.minecraft.util.BlockPos;
 import net.minecraft.village.Village;
@@ -28,7 +27,6 @@ import net.minecraft.world.World;
  * 
  */
 public class EntityAIVillagerMate extends EntityAIBase {
-
 	private EntityVillager villagerObj;
 	private EntityVillager mate;
 	private World worldObj;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIWander.java b/src/main/java/net/minecraft/entity/ai/EntityAIWander.java
index 5a5532b..83b2f3f 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIWander.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIWander.java
@@ -1,8 +1,6 @@
 package net.minecraft.entity.ai;
 
 import net.minecraft.entity.EntityCreature;
-import net.minecraft.entity.ai.EntityAIBase;
-import net.minecraft.entity.ai.RandomPositionGenerator;
 import net.minecraft.util.Vec3;
 
 /**+
@@ -26,7 +24,6 @@ import net.minecraft.util.Vec3;
  * 
  */
 public class EntityAIWander extends EntityAIBase {
-
 	private EntityCreature entity;
 	private double xPosition;
 	private double yPosition;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIWatchClosest.java b/src/main/java/net/minecraft/entity/ai/EntityAIWatchClosest.java
index c596106..74e79dc 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIWatchClosest.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIWatchClosest.java
@@ -2,7 +2,6 @@ package net.minecraft.entity.ai;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
-import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.entity.player.EntityPlayer;
 
 /**+
@@ -26,7 +25,6 @@ import net.minecraft.entity.player.EntityPlayer;
  * 
  */
 public class EntityAIWatchClosest extends EntityAIBase {
-
 	protected EntityLiving theWatcher;
 	protected Entity closestEntity;
 	protected float maxDistanceForPlayer;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityAIWatchClosest2.java b/src/main/java/net/minecraft/entity/ai/EntityAIWatchClosest2.java
index d1b36da..6f71697 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityAIWatchClosest2.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityAIWatchClosest2.java
@@ -2,7 +2,6 @@ package net.minecraft.entity.ai;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
-import net.minecraft.entity.ai.EntityAIWatchClosest;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -25,7 +24,6 @@ import net.minecraft.entity.ai.EntityAIWatchClosest;
  * 
  */
 public class EntityAIWatchClosest2 extends EntityAIWatchClosest {
-
 	public EntityAIWatchClosest2(EntityLiving entitylivingIn, Class<? extends Entity> watchTargetClass,
 			float maxDistance, float chanceIn) {
 		super(entitylivingIn, watchTargetClass, maxDistance, chanceIn);
diff --git a/src/main/java/net/minecraft/entity/ai/EntityJumpHelper.java b/src/main/java/net/minecraft/entity/ai/EntityJumpHelper.java
index ce32168..69f8d63 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityJumpHelper.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityJumpHelper.java
@@ -23,7 +23,6 @@ import net.minecraft.entity.EntityLiving;
  * 
  */
 public class EntityJumpHelper {
-
 	private EntityLiving entity;
 	protected boolean isJumping;
 
diff --git a/src/main/java/net/minecraft/entity/ai/EntityLookHelper.java b/src/main/java/net/minecraft/entity/ai/EntityLookHelper.java
index f6c5729..23cbbee 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityLookHelper.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityLookHelper.java
@@ -26,7 +26,6 @@ import net.minecraft.util.MathHelper;
  * 
  */
 public class EntityLookHelper {
-
 	private EntityLiving entity;
 	private float deltaLookYaw;
 	private float deltaLookPitch;
diff --git a/src/main/java/net/minecraft/entity/ai/EntityMoveHelper.java b/src/main/java/net/minecraft/entity/ai/EntityMoveHelper.java
index 5019565..3aaa53d 100755
--- a/src/main/java/net/minecraft/entity/ai/EntityMoveHelper.java
+++ b/src/main/java/net/minecraft/entity/ai/EntityMoveHelper.java
@@ -25,7 +25,6 @@ import net.minecraft.util.MathHelper;
  * 
  */
 public class EntityMoveHelper {
-
 	protected EntityLiving entity;
 	protected double posX;
 	protected double posY;
diff --git a/src/main/java/net/minecraft/entity/ai/EntitySenses.java b/src/main/java/net/minecraft/entity/ai/EntitySenses.java
index 17610a0..5450b10 100755
--- a/src/main/java/net/minecraft/entity/ai/EntitySenses.java
+++ b/src/main/java/net/minecraft/entity/ai/EntitySenses.java
@@ -26,7 +26,6 @@ import net.minecraft.entity.EntityLiving;
  * 
  */
 public class EntitySenses {
-
 	EntityLiving entityObj;
 	List<Entity> seenEntities = Lists.newArrayList();
 	List<Entity> unseenEntities = Lists.newArrayList();
diff --git a/src/main/java/net/minecraft/entity/ai/RandomPositionGenerator.java b/src/main/java/net/minecraft/entity/ai/RandomPositionGenerator.java
index ee8852c..0caab24 100755
--- a/src/main/java/net/minecraft/entity/ai/RandomPositionGenerator.java
+++ b/src/main/java/net/minecraft/entity/ai/RandomPositionGenerator.java
@@ -27,7 +27,6 @@ import net.minecraft.util.Vec3;
  * 
  */
 public class RandomPositionGenerator {
-
 	/**+
 	 * used to store a driection when the user passes a point to
 	 * move towards or away from. WARNING: NEVER THREAD SAFE.
diff --git a/src/main/java/net/minecraft/entity/ai/attributes/ServersideAttributeMap.java b/src/main/java/net/minecraft/entity/ai/attributes/ServersideAttributeMap.java
index e5b215e..1d4e627 100755
--- a/src/main/java/net/minecraft/entity/ai/attributes/ServersideAttributeMap.java
+++ b/src/main/java/net/minecraft/entity/ai/attributes/ServersideAttributeMap.java
@@ -5,11 +5,6 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import net.minecraft.entity.ai.attributes.BaseAttributeMap;
-import net.minecraft.entity.ai.attributes.IAttribute;
-import net.minecraft.entity.ai.attributes.IAttributeInstance;
-import net.minecraft.entity.ai.attributes.ModifiableAttributeInstance;
-import net.minecraft.entity.ai.attributes.RangedAttribute;
 import net.minecraft.server.management.LowerStringMap;
 
 /**+
diff --git a/src/main/java/net/minecraft/entity/boss/EntityDragon.java b/src/main/java/net/minecraft/entity/boss/EntityDragon.java
index bf79be0..d2bbe1c 100755
--- a/src/main/java/net/minecraft/entity/boss/EntityDragon.java
+++ b/src/main/java/net/minecraft/entity/boss/EntityDragon.java
@@ -12,8 +12,6 @@ import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.IEntityMultiPart;
 import net.minecraft.entity.SharedMonsterAttributes;
-import net.minecraft.entity.boss.EntityDragonPart;
-import net.minecraft.entity.boss.IBossDisplayData;
 import net.minecraft.entity.item.EntityEnderCrystal;
 import net.minecraft.entity.item.EntityXPOrb;
 import net.minecraft.entity.monster.IMob;
@@ -381,12 +379,13 @@ public class EntityDragon extends EntityLiving implements IBossDisplayData, IEnt
 
 		if (this.rand.nextInt(10) == 0) {
 			float f = 32.0F;
-			List list = this.worldObj.getEntitiesWithinAABB(EntityEnderCrystal.class,
+			List<EntityEnderCrystal> list = this.worldObj.getEntitiesWithinAABB(EntityEnderCrystal.class,
 					this.getEntityBoundingBox().expand((double) f, (double) f, (double) f));
 			EntityEnderCrystal entityendercrystal = null;
 			double d0 = Double.MAX_VALUE;
 
-			for (EntityEnderCrystal entityendercrystal1 : (List<EntityEnderCrystal>) list) {
+			for (int i = 0, l = list.size(); i < l; ++i) {
+				EntityEnderCrystal entityendercrystal1 = list.get(i);
 				double d1 = entityendercrystal1.getDistanceSqToEntity(this);
 				if (d1 < d0) {
 					d0 = d1;
@@ -409,7 +408,8 @@ public class EntityDragon extends EntityLiving implements IBossDisplayData, IEnt
 		double d1 = (this.dragonPartBody.getEntityBoundingBox().minZ + this.dragonPartBody.getEntityBoundingBox().maxZ)
 				/ 2.0D;
 
-		for (Entity entity : parList) {
+		for (int i = 0, l = parList.size(); i < l; ++i) {
+			Entity entity = parList.get(i);
 			if (entity instanceof EntityLivingBase) {
 				double d2 = entity.posX - d0;
 				double d3 = entity.posZ - d1;
@@ -425,7 +425,7 @@ public class EntityDragon extends EntityLiving implements IBossDisplayData, IEnt
 	 * damage.
 	 */
 	private void attackEntitiesInList(List<Entity> parList) {
-		for (int i = 0; i < parList.size(); ++i) {
+		for (int i = 0, l = parList.size(); i < l; ++i) {
 			Entity entity = (Entity) parList.get(i);
 			if (entity instanceof EntityLivingBase) {
 				entity.attackEntityFrom(DamageSource.causeMobDamage(this), 10.0F);
diff --git a/src/main/java/net/minecraft/entity/boss/EntityWither.java b/src/main/java/net/minecraft/entity/boss/EntityWither.java
index d48ea13..4cace76 100755
--- a/src/main/java/net/minecraft/entity/boss/EntityWither.java
+++ b/src/main/java/net/minecraft/entity/boss/EntityWither.java
@@ -18,7 +18,6 @@ import net.minecraft.entity.ai.EntityAINearestAttackableTarget;
 import net.minecraft.entity.ai.EntityAISwimming;
 import net.minecraft.entity.ai.EntityAIWander;
 import net.minecraft.entity.ai.EntityAIWatchClosest;
-import net.minecraft.entity.boss.IBossDisplayData;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.monster.EntityMob;
 import net.minecraft.entity.player.EntityPlayer;
@@ -96,10 +95,10 @@ public class EntityWither extends EntityMob implements IBossDisplayData, IRanged
 
 	protected void entityInit() {
 		super.entityInit();
-		this.dataWatcher.addObject(17, new Integer(0));
-		this.dataWatcher.addObject(18, new Integer(0));
-		this.dataWatcher.addObject(19, new Integer(0));
-		this.dataWatcher.addObject(20, new Integer(0));
+		this.dataWatcher.addObject(17, Integer.valueOf(0));
+		this.dataWatcher.addObject(18, Integer.valueOf(0));
+		this.dataWatcher.addObject(19, Integer.valueOf(0));
+		this.dataWatcher.addObject(20, Integer.valueOf(0));
 	}
 
 	/**+
@@ -501,9 +500,10 @@ public class EntityWither extends EntityMob implements IBossDisplayData, IRanged
 		}
 
 		if (!this.worldObj.isRemote) {
-			for (EntityPlayer entityplayer : this.worldObj.getEntitiesWithinAABB(EntityPlayer.class,
-					this.getEntityBoundingBox().expand(50.0D, 100.0D, 50.0D))) {
-				entityplayer.triggerAchievement(AchievementList.killWither);
+			List<EntityPlayer> lst = this.worldObj.getEntitiesWithinAABB(EntityPlayer.class,
+					this.getEntityBoundingBox().expand(50.0D, 100.0D, 50.0D));
+			for (int i = 0, l = lst.size(); i < l; ++i) {
+				lst.get(i).triggerAchievement(AchievementList.killWither);
 			}
 		}
 
diff --git a/src/main/java/net/minecraft/entity/effect/EntityLightningBolt.java b/src/main/java/net/minecraft/entity/effect/EntityLightningBolt.java
index 7a8f753..2686996 100755
--- a/src/main/java/net/minecraft/entity/effect/EntityLightningBolt.java
+++ b/src/main/java/net/minecraft/entity/effect/EntityLightningBolt.java
@@ -3,7 +3,6 @@ package net.minecraft.entity.effect;
 import java.util.List;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.effect.EntityWeatherEffect;
 import net.minecraft.init.Blocks;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.AxisAlignedBB;
diff --git a/src/main/java/net/minecraft/entity/item/EntityBoat.java b/src/main/java/net/minecraft/entity/item/EntityBoat.java
index b5c1399..8b0aedc 100755
--- a/src/main/java/net/minecraft/entity/item/EntityBoat.java
+++ b/src/main/java/net/minecraft/entity/item/EntityBoat.java
@@ -69,9 +69,9 @@ public class EntityBoat extends Entity {
 	}
 
 	protected void entityInit() {
-		this.dataWatcher.addObject(17, new Integer(0));
-		this.dataWatcher.addObject(18, new Integer(1));
-		this.dataWatcher.addObject(19, new Float(0.0F));
+		this.dataWatcher.addObject(17, Integer.valueOf(0));
+		this.dataWatcher.addObject(18, Integer.valueOf(1));
+		this.dataWatcher.addObject(19, Float.valueOf(0.0F));
 	}
 
 	/**+
diff --git a/src/main/java/net/minecraft/entity/item/EntityFallingBlock.java b/src/main/java/net/minecraft/entity/item/EntityFallingBlock.java
index e8a8ca0..6aab328 100755
--- a/src/main/java/net/minecraft/entity/item/EntityFallingBlock.java
+++ b/src/main/java/net/minecraft/entity/item/EntityFallingBlock.java
@@ -178,8 +178,8 @@ public class EntityFallingBlock extends Entity {
 				boolean flag = block == Blocks.anvil;
 				DamageSource damagesource = flag ? DamageSource.anvil : DamageSource.fallingBlock;
 
-				for (Entity entity : arraylist) {
-					entity.attackEntityFrom(damagesource, (float) Math
+				for (int j = 0, l = arraylist.size(); j < l; ++j) {
+					arraylist.get(j).attackEntityFrom(damagesource, (float) Math
 							.min(MathHelper.floor_float((float) i * this.fallHurtAmount), this.fallHurtMax));
 				}
 
diff --git a/src/main/java/net/minecraft/entity/item/EntityItem.java b/src/main/java/net/minecraft/entity/item/EntityItem.java
index dd188ad..ac8f39e 100755
--- a/src/main/java/net/minecraft/entity/item/EntityItem.java
+++ b/src/main/java/net/minecraft/entity/item/EntityItem.java
@@ -1,5 +1,7 @@
 package net.minecraft.entity.item;
 
+import java.util.List;
+
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 import net.minecraft.block.material.Material;
@@ -150,9 +152,10 @@ public class EntityItem extends Entity {
 	 * together
 	 */
 	private void searchForOtherItemsNearby() {
-		for (EntityItem entityitem : this.worldObj.getEntitiesWithinAABB(EntityItem.class,
-				this.getEntityBoundingBox().expand(0.5D, 0.0D, 0.5D))) {
-			this.combineItems(entityitem);
+		List<EntityItem> lst = this.worldObj.getEntitiesWithinAABB(EntityItem.class,
+				this.getEntityBoundingBox().expand(0.5D, 0.0D, 0.5D));
+		for (int i = 0, l = lst.size(); i < l; ++i) {
+			this.combineItems(lst.get(i));
 		}
 
 	}
diff --git a/src/main/java/net/minecraft/entity/item/EntityMinecart.java b/src/main/java/net/minecraft/entity/item/EntityMinecart.java
index f837cc4..c76c9fb 100755
--- a/src/main/java/net/minecraft/entity/item/EntityMinecart.java
+++ b/src/main/java/net/minecraft/entity/item/EntityMinecart.java
@@ -1,5 +1,6 @@
 package net.minecraft.entity.item;
 
+import java.util.List;
 import java.util.Map;
 
 import com.google.common.collect.Maps;
@@ -108,11 +109,11 @@ public abstract class EntityMinecart extends Entity implements IWorldNameable {
 	}
 
 	protected void entityInit() {
-		this.dataWatcher.addObject(17, new Integer(0));
-		this.dataWatcher.addObject(18, new Integer(1));
-		this.dataWatcher.addObject(19, new Float(0.0F));
-		this.dataWatcher.addObject(20, new Integer(0));
-		this.dataWatcher.addObject(21, new Integer(6));
+		this.dataWatcher.addObject(17, Integer.valueOf(0));
+		this.dataWatcher.addObject(18, Integer.valueOf(1));
+		this.dataWatcher.addObject(19, Float.valueOf(0.0F));
+		this.dataWatcher.addObject(20, Integer.valueOf(0));
+		this.dataWatcher.addObject(21, Integer.valueOf(6));
 		this.dataWatcher.addObject(22, Byte.valueOf((byte) 0));
 	}
 
@@ -344,8 +345,10 @@ public abstract class EntityMinecart extends Entity implements IWorldNameable {
 
 			this.setRotation(this.rotationYaw, this.rotationPitch);
 
-			for (Entity entity : this.worldObj.getEntitiesWithinAABBExcludingEntity(this,
-					this.getEntityBoundingBox().expand(0.20000000298023224D, 0.0D, 0.20000000298023224D))) {
+			List<Entity> lst = this.worldObj.getEntitiesWithinAABBExcludingEntity(this,
+					this.getEntityBoundingBox().expand(0.20000000298023224D, 0.0D, 0.20000000298023224D));
+			for (int i = 0, m = lst.size(); i < m; ++i) {
+				Entity entity = lst.get(i);
 				if (entity != this.riddenByEntity && entity.canBePushed() && entity instanceof EntityMinecart) {
 					entity.applyEntityCollision(this);
 				}
@@ -1002,9 +1005,9 @@ public abstract class EntityMinecart extends Entity implements IWorldNameable {
 		}
 
 		static {
-			for (EntityMinecart.EnumMinecartType entityminecart$enumminecarttype : values()) {
-				ID_LOOKUP.put(Integer.valueOf(entityminecart$enumminecarttype.getNetworkID()),
-						entityminecart$enumminecarttype);
+			EntityMinecart.EnumMinecartType[] types = values();
+			for (int i = 0; i < types.length; ++i) {
+				ID_LOOKUP.put(Integer.valueOf(types[i].getNetworkID()), types[i]);
 			}
 
 		}
diff --git a/src/main/java/net/minecraft/entity/item/EntityMinecartFurnace.java b/src/main/java/net/minecraft/entity/item/EntityMinecartFurnace.java
index 101235e..3a7f833 100755
--- a/src/main/java/net/minecraft/entity/item/EntityMinecartFurnace.java
+++ b/src/main/java/net/minecraft/entity/item/EntityMinecartFurnace.java
@@ -53,7 +53,7 @@ public class EntityMinecartFurnace extends EntityMinecart {
 
 	protected void entityInit() {
 		super.entityInit();
-		this.dataWatcher.addObject(16, new Byte((byte) 0));
+		this.dataWatcher.addObject(16, Byte.valueOf((byte) 0));
 	}
 
 	/**+
diff --git a/src/main/java/net/minecraft/entity/item/EntityPainting.java b/src/main/java/net/minecraft/entity/item/EntityPainting.java
index 23747a7..8dd0942 100755
--- a/src/main/java/net/minecraft/entity/item/EntityPainting.java
+++ b/src/main/java/net/minecraft/entity/item/EntityPainting.java
@@ -45,11 +45,12 @@ public class EntityPainting extends EntityHanging {
 		super(worldIn, pos);
 		ArrayList arraylist = Lists.newArrayList();
 
-		for (EntityPainting.EnumArt entitypainting$enumart : EntityPainting.EnumArt.values()) {
-			this.art = entitypainting$enumart;
+		EntityPainting.EnumArt[] types = EntityPainting.EnumArt._VALUES;
+		for (int i = 0; i < types.length; ++i) {
+			this.art = types[i];
 			this.updateFacingWithBoundingBox(facing);
 			if (this.onValidSurface()) {
-				arraylist.add(entitypainting$enumart);
+				arraylist.add(types[i]);
 			}
 		}
 
@@ -63,7 +64,9 @@ public class EntityPainting extends EntityHanging {
 	public EntityPainting(World worldIn, BlockPos pos, EnumFacing facing, String title) {
 		this(worldIn, pos, facing);
 
-		for (EntityPainting.EnumArt entitypainting$enumart : EntityPainting.EnumArt.values()) {
+		EntityPainting.EnumArt[] types = EntityPainting.EnumArt._VALUES;
+		for (int i = 0; i < types.length; ++i) {
+			EntityPainting.EnumArt entitypainting$enumart = types[i];
 			if (entitypainting$enumart.title.equals(title)) {
 				this.art = entitypainting$enumart;
 				break;
@@ -89,7 +92,9 @@ public class EntityPainting extends EntityHanging {
 	public void readEntityFromNBT(NBTTagCompound nbttagcompound) {
 		String s = nbttagcompound.getString("Motive");
 
-		for (EntityPainting.EnumArt entitypainting$enumart : EntityPainting.EnumArt.values()) {
+		EntityPainting.EnumArt[] types = EntityPainting.EnumArt._VALUES;
+		for (int i = 0; i < types.length; ++i) {
+			EntityPainting.EnumArt entitypainting$enumart = types[i];
 			if (entitypainting$enumart.title.equals(s)) {
 				this.art = entitypainting$enumart;
 			}
@@ -153,6 +158,8 @@ public class EntityPainting extends EntityHanging {
 		BURNING_SKULL("BurningSkull", 64, 64, 128, 192), SKELETON("Skeleton", 64, 48, 192, 64),
 		DONKEY_KONG("DonkeyKong", 64, 48, 192, 112);
 
+		public static final EnumArt[] _VALUES = values();
+
 		public static final int field_180001_A = "SkullAndRoses".length();
 		public final String title;
 		public final int sizeX;
diff --git a/src/main/java/net/minecraft/entity/monster/EntityBlaze.java b/src/main/java/net/minecraft/entity/monster/EntityBlaze.java
index 74e04ee..b77711c 100755
--- a/src/main/java/net/minecraft/entity/monster/EntityBlaze.java
+++ b/src/main/java/net/minecraft/entity/monster/EntityBlaze.java
@@ -69,7 +69,7 @@ public class EntityBlaze extends EntityMob {
 
 	protected void entityInit() {
 		super.entityInit();
-		this.dataWatcher.addObject(16, new Byte((byte) 0));
+		this.dataWatcher.addObject(16, Byte.valueOf((byte) 0));
 	}
 
 	/**+
diff --git a/src/main/java/net/minecraft/entity/monster/EntityEnderman.java b/src/main/java/net/minecraft/entity/monster/EntityEnderman.java
index 1fcab97..01a3716 100755
--- a/src/main/java/net/minecraft/entity/monster/EntityEnderman.java
+++ b/src/main/java/net/minecraft/entity/monster/EntityEnderman.java
@@ -98,9 +98,9 @@ public class EntityEnderman extends EntityMob {
 
 	protected void entityInit() {
 		super.entityInit();
-		this.dataWatcher.addObject(16, new Short((short) 0));
-		this.dataWatcher.addObject(17, new Byte((byte) 0));
-		this.dataWatcher.addObject(18, new Byte((byte) 0));
+		this.dataWatcher.addObject(16, Short.valueOf((short) 0));
+		this.dataWatcher.addObject(17, Byte.valueOf((byte) 0));
+		this.dataWatcher.addObject(18, Byte.valueOf((byte) 0));
 	}
 
 	/**+
diff --git a/src/main/java/net/minecraft/entity/monster/EntityGuardian.java b/src/main/java/net/minecraft/entity/monster/EntityGuardian.java
index 90ce59a..1f5ec87 100755
--- a/src/main/java/net/minecraft/entity/monster/EntityGuardian.java
+++ b/src/main/java/net/minecraft/entity/monster/EntityGuardian.java
@@ -1,5 +1,7 @@
 package net.minecraft.entity.monster;
 
+import java.util.List;
+
 import com.google.common.base.Predicate;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.Entity;
@@ -397,13 +399,15 @@ public class EntityGuardian extends EntityMob {
 			if ((this.ticksExisted + this.getEntityId()) % 1200 == 0) {
 				Potion potion = Potion.digSlowdown;
 
-				for (EntityPlayerMP entityplayermp : this.worldObj.getPlayers(EntityPlayerMP.class,
+				List<EntityPlayerMP> lst = this.worldObj.getPlayers(EntityPlayerMP.class,
 						new Predicate<EntityPlayerMP>() {
 							public boolean apply(EntityPlayerMP entityplayermp1) {
 								return EntityGuardian.this.getDistanceSqToEntity(entityplayermp1) < 2500.0D
 										&& entityplayermp1.theItemInWorldManager.survivalOrAdventure();
 							}
-						})) {
+						});
+				for (int i = 0, l = lst.size(); i < l; ++i) {
+					EntityPlayerMP entityplayermp = lst.get(i);
 					if (!entityplayermp.isPotionActive(potion)
 							|| entityplayermp.getActivePotionEffect(potion).getAmplifier() < 2
 							|| entityplayermp.getActivePotionEffect(potion).getDuration() < 1200) {
diff --git a/src/main/java/net/minecraft/entity/monster/EntitySkeleton.java b/src/main/java/net/minecraft/entity/monster/EntitySkeleton.java
index 3e45a44..7821bc7 100755
--- a/src/main/java/net/minecraft/entity/monster/EntitySkeleton.java
+++ b/src/main/java/net/minecraft/entity/monster/EntitySkeleton.java
@@ -89,7 +89,7 @@ public class EntitySkeleton extends EntityMob implements IRangedAttackMob {
 
 	protected void entityInit() {
 		super.entityInit();
-		this.dataWatcher.addObject(13, new Byte((byte) 0));
+		this.dataWatcher.addObject(13, Byte.valueOf((byte) 0));
 	}
 
 	/**+
diff --git a/src/main/java/net/minecraft/entity/monster/EntitySpider.java b/src/main/java/net/minecraft/entity/monster/EntitySpider.java
index 2922d7f..f84df43 100755
--- a/src/main/java/net/minecraft/entity/monster/EntitySpider.java
+++ b/src/main/java/net/minecraft/entity/monster/EntitySpider.java
@@ -80,7 +80,7 @@ public class EntitySpider extends EntityMob {
 
 	protected void entityInit() {
 		super.entityInit();
-		this.dataWatcher.addObject(16, new Byte((byte) 0));
+		this.dataWatcher.addObject(16, Byte.valueOf((byte) 0));
 	}
 
 	/**+
diff --git a/src/main/java/net/minecraft/entity/monster/EntityWitch.java b/src/main/java/net/minecraft/entity/monster/EntityWitch.java
index 9488ad4..f708fc2 100755
--- a/src/main/java/net/minecraft/entity/monster/EntityWitch.java
+++ b/src/main/java/net/minecraft/entity/monster/EntityWitch.java
@@ -132,8 +132,8 @@ public class EntityWitch extends EntityMob implements IRangedAttackMob {
 					if (itemstack != null && itemstack.getItem() == Items.potionitem) {
 						List<PotionEffect> list = Items.potionitem.getEffects(itemstack);
 						if (list != null) {
-							for (PotionEffect potioneffect : list) {
-								this.addPotionEffect(new PotionEffect(potioneffect));
+							for (int i = 0, l = list.size(); i < l; ++i) {
+								this.addPotionEffect(new PotionEffect(list.get(i)));
 							}
 						}
 					}
diff --git a/src/main/java/net/minecraft/entity/passive/EntityBat.java b/src/main/java/net/minecraft/entity/passive/EntityBat.java
index 4746c91..a1571b0 100755
--- a/src/main/java/net/minecraft/entity/passive/EntityBat.java
+++ b/src/main/java/net/minecraft/entity/passive/EntityBat.java
@@ -42,7 +42,7 @@ public class EntityBat extends EntityAmbientCreature {
 
 	protected void entityInit() {
 		super.entityInit();
-		this.dataWatcher.addObject(16, new Byte((byte) 0));
+		this.dataWatcher.addObject(16, Byte.valueOf((byte) 0));
 	}
 
 	/**+
diff --git a/src/main/java/net/minecraft/entity/passive/EntityHorse.java b/src/main/java/net/minecraft/entity/passive/EntityHorse.java
index d410a7b..5829480 100755
--- a/src/main/java/net/minecraft/entity/passive/EntityHorse.java
+++ b/src/main/java/net/minecraft/entity/passive/EntityHorse.java
@@ -1,5 +1,7 @@
 package net.minecraft.entity.passive;
 
+import java.util.List;
+
 import com.google.common.base.Predicate;
 
 import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController;
@@ -486,8 +488,10 @@ public class EntityHorse extends EntityAnimal implements IInvBasic {
 		double d0 = Double.MAX_VALUE;
 		Entity entity = null;
 
-		for (Entity entity1 : this.worldObj.getEntitiesInAABBexcluding(entityIn,
-				entityIn.getEntityBoundingBox().addCoord(distance, distance, distance), horseBreedingSelector)) {
+		List<Entity> lst = this.worldObj.getEntitiesInAABBexcluding(entityIn,
+				entityIn.getEntityBoundingBox().addCoord(distance, distance, distance), horseBreedingSelector);
+		for (int i = 0, l = lst.size(); i < l; ++i) {
+			Entity entity1 = lst.get(i);
 			double d1 = entity1.getDistanceSq(entityIn.posX, entityIn.posY, entityIn.posZ);
 			if (d1 < d0) {
 				entity = entity1;
diff --git a/src/main/java/net/minecraft/entity/passive/EntitySheep.java b/src/main/java/net/minecraft/entity/passive/EntitySheep.java
index 3e4dfde..e23cd75 100755
--- a/src/main/java/net/minecraft/entity/passive/EntitySheep.java
+++ b/src/main/java/net/minecraft/entity/passive/EntitySheep.java
@@ -115,7 +115,7 @@ public class EntitySheep extends EntityAnimal {
 
 	protected void entityInit() {
 		super.entityInit();
-		this.dataWatcher.addObject(16, new Byte((byte) 0));
+		this.dataWatcher.addObject(16, Byte.valueOf((byte) 0));
 	}
 
 	/**+
diff --git a/src/main/java/net/minecraft/entity/passive/EntityVillager.java b/src/main/java/net/minecraft/entity/passive/EntityVillager.java
index 054ec92..d2c9859 100755
--- a/src/main/java/net/minecraft/entity/passive/EntityVillager.java
+++ b/src/main/java/net/minecraft/entity/passive/EntityVillager.java
@@ -1,5 +1,8 @@
 package net.minecraft.entity.passive;
 
+import java.util.Arrays;
+import java.util.List;
+
 import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentData;
@@ -102,40 +105,48 @@ public class EntityVillager extends EntityAgeable implements IMerchant, INpc {
 	 * A multi-dimensional array mapping the various professions,
 	 * careers and career levels that a Villager may offer
 	 */
-	private static EntityVillager.ITradeList[][][][] DEFAULT_TRADE_LIST_MAP = null;
+	private static List<List<List<List<EntityVillager.ITradeList>>>> DEFAULT_TRADE_LIST_MAP = null;
 
 	public static void bootstrap() {
-		DEFAULT_TRADE_LIST_MAP = new EntityVillager.ITradeList[][][][] {
-				{ { { new EntityVillager.EmeraldForItems(Items.wheat, new EntityVillager.PriceInfo(18, 22)),
+		DEFAULT_TRADE_LIST_MAP = Arrays.asList(
+				Arrays.asList(Arrays.asList(Arrays.asList(
+						new EntityVillager.EmeraldForItems(Items.wheat, new EntityVillager.PriceInfo(18, 22)),
 						new EntityVillager.EmeraldForItems(Items.potato, new EntityVillager.PriceInfo(15, 19)),
 						new EntityVillager.EmeraldForItems(Items.carrot,
 								new EntityVillager.PriceInfo(15, 19)),
-						new EntityVillager.ListItemForEmeralds(Items.bread, new EntityVillager.PriceInfo(-4, -2)) },
-						{ new EntityVillager.EmeraldForItems(Item.getItemFromBlock(Blocks.pumpkin),
-								new EntityVillager.PriceInfo(8, 13)),
+						new EntityVillager.ListItemForEmeralds(Items.bread, new EntityVillager.PriceInfo(-4, -2))),
+						Arrays.asList(
+								new EntityVillager.EmeraldForItems(Item.getItemFromBlock(Blocks.pumpkin),
+										new EntityVillager.PriceInfo(8, 13)),
 								new EntityVillager.ListItemForEmeralds(Items.pumpkin_pie,
-										new EntityVillager.PriceInfo(-3, -2)) },
-						{ new EntityVillager.EmeraldForItems(Item.getItemFromBlock(Blocks.melon_block),
-								new EntityVillager.PriceInfo(7, 12)),
+										new EntityVillager.PriceInfo(-3, -2))),
+						Arrays.asList(
+								new EntityVillager.EmeraldForItems(Item.getItemFromBlock(Blocks.melon_block),
+										new EntityVillager.PriceInfo(7, 12)),
 								new EntityVillager.ListItemForEmeralds(Items.apple,
-										new EntityVillager.PriceInfo(-5, -7)) },
-						{ new EntityVillager.ListItemForEmeralds(Items.cookie, new EntityVillager.PriceInfo(-6, -10)),
+										new EntityVillager.PriceInfo(-5, -7))),
+						Arrays.asList(
+								new EntityVillager.ListItemForEmeralds(Items.cookie,
+										new EntityVillager.PriceInfo(-6, -10)),
 								new EntityVillager.ListItemForEmeralds(Items.cake,
-										new EntityVillager.PriceInfo(1, 1)) } },
-						{ { new EntityVillager.EmeraldForItems(Items.string, new EntityVillager.PriceInfo(15, 20)),
+										new EntityVillager.PriceInfo(1, 1)))),
+						Arrays.asList(Arrays.asList(
+								new EntityVillager.EmeraldForItems(Items.string, new EntityVillager.PriceInfo(15, 20)),
 								new EntityVillager.EmeraldForItems(Items.coal, new EntityVillager.PriceInfo(16, 24)),
-								new EntityVillager.ItemAndEmeraldToItem(
-										Items.fish, new EntityVillager.PriceInfo(6, 6), Items.cooked_fish,
-										new EntityVillager.PriceInfo(6, 6)) },
-								{ new EntityVillager.ListEnchantedItemForEmeralds(Items.fishing_rod,
-										new EntityVillager.PriceInfo(7, 8)) } },
-						{ { new EntityVillager.EmeraldForItems(Item.getItemFromBlock(Blocks.wool),
-								new EntityVillager.PriceInfo(16, 22)),
-								new EntityVillager.ListItemForEmeralds(Items.shears,
-										new EntityVillager.PriceInfo(3, 4)) },
-								{ new EntityVillager.ListItemForEmeralds(
-										new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 0),
-										new EntityVillager.PriceInfo(1, 2)),
+								new EntityVillager.ItemAndEmeraldToItem(Items.fish, new EntityVillager.PriceInfo(6, 6),
+										Items.cooked_fish, new EntityVillager.PriceInfo(6, 6))),
+								Arrays.asList(new EntityVillager.ListEnchantedItemForEmeralds(Items.fishing_rod,
+										new EntityVillager.PriceInfo(7, 8)))),
+						Arrays.asList(
+								Arrays.asList(
+										new EntityVillager.EmeraldForItems(Item.getItemFromBlock(Blocks.wool),
+												new EntityVillager.PriceInfo(16, 22)),
+										new EntityVillager.ListItemForEmeralds(Items.shears,
+												new EntityVillager.PriceInfo(3, 4))),
+								Arrays.asList(
+										new EntityVillager.ListItemForEmeralds(
+												new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 0),
+												new EntityVillager.PriceInfo(1, 2)),
 										new EntityVillager.ListItemForEmeralds(
 												new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 1),
 												new EntityVillager.PriceInfo(1, 2)),
@@ -180,93 +191,125 @@ public class EntityVillager extends EntityAgeable implements IMerchant, INpc {
 												new EntityVillager.PriceInfo(1, 2)),
 										new EntityVillager.ListItemForEmeralds(
 												new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 15),
-												new EntityVillager.PriceInfo(1, 2)) } },
-						{ { new EntityVillager.EmeraldForItems(Items.string, new EntityVillager.PriceInfo(15, 20)),
+												new EntityVillager.PriceInfo(1, 2)))),
+						Arrays.asList(Arrays.asList(
+								new EntityVillager.EmeraldForItems(Items.string, new EntityVillager.PriceInfo(15, 20)),
 								new EntityVillager.ListItemForEmeralds(Items.arrow,
-										new EntityVillager.PriceInfo(-12, -8)) },
-								{ new EntityVillager.ListItemForEmeralds(Items.bow, new EntityVillager.PriceInfo(2, 3)),
+										new EntityVillager.PriceInfo(-12, -8))),
+								Arrays.asList(
+										new EntityVillager.ListItemForEmeralds(Items.bow,
+												new EntityVillager.PriceInfo(2, 3)),
 										new EntityVillager.ItemAndEmeraldToItem(Item.getItemFromBlock(Blocks.gravel),
 												new EntityVillager.PriceInfo(10, 10), Items.flint,
-												new EntityVillager.PriceInfo(6, 10)) } } },
-				{ { { new EntityVillager.EmeraldForItems(Items.paper, new EntityVillager.PriceInfo(24, 36)),
-						new EntityVillager.ListEnchantedBookForEmeralds() },
-						{ new EntityVillager.EmeraldForItems(Items.book, new EntityVillager.PriceInfo(8, 10)),
+												new EntityVillager.PriceInfo(6, 10))))),
+				Arrays.asList(Arrays.asList(
+						Arrays.asList(
+								new EntityVillager.EmeraldForItems(Items.paper, new EntityVillager.PriceInfo(24, 36)),
+								new EntityVillager.ListEnchantedBookForEmeralds()),
+						Arrays.asList(
+								new EntityVillager.EmeraldForItems(Items.book, new EntityVillager.PriceInfo(8, 10)),
 								new EntityVillager.ListItemForEmeralds(Items.compass,
 										new EntityVillager.PriceInfo(10, 12)),
 								new EntityVillager.ListItemForEmeralds(Item.getItemFromBlock(Blocks.bookshelf),
-										new EntityVillager.PriceInfo(3, 4)) },
-						{ new EntityVillager.EmeraldForItems(Items.written_book, new EntityVillager.PriceInfo(2, 2)),
+										new EntityVillager.PriceInfo(3, 4))),
+						Arrays.asList(
+								new EntityVillager.EmeraldForItems(Items.written_book,
+										new EntityVillager.PriceInfo(2, 2)),
 								new EntityVillager.ListItemForEmeralds(Items.clock,
 										new EntityVillager.PriceInfo(10, 12)),
 								new EntityVillager.ListItemForEmeralds(Item.getItemFromBlock(Blocks.glass),
-										new EntityVillager.PriceInfo(-5, -3)) },
-						{ new EntityVillager.ListEnchantedBookForEmeralds() },
-						{ new EntityVillager.ListEnchantedBookForEmeralds() },
-						{ new EntityVillager.ListItemForEmeralds(Items.name_tag,
-								new EntityVillager.PriceInfo(20, 22)) } } },
-				{ { { new EntityVillager.EmeraldForItems(Items.rotten_flesh, new EntityVillager.PriceInfo(36, 40)),
-						new EntityVillager.EmeraldForItems(Items.gold_ingot, new EntityVillager.PriceInfo(8, 10)) },
-						{ new EntityVillager.ListItemForEmeralds(Items.redstone, new EntityVillager.PriceInfo(-4, -1)),
+										new EntityVillager.PriceInfo(-5, -3))),
+						Arrays.asList(new EntityVillager.ListEnchantedBookForEmeralds()),
+						Arrays.asList(new EntityVillager.ListEnchantedBookForEmeralds()),
+						Arrays.asList(new EntityVillager.ListItemForEmeralds(Items.name_tag,
+								new EntityVillager.PriceInfo(20, 22))))),
+				Arrays.asList(Arrays.asList(Arrays.asList(
+						new EntityVillager.EmeraldForItems(Items.rotten_flesh, new EntityVillager.PriceInfo(36, 40)),
+						new EntityVillager.EmeraldForItems(Items.gold_ingot, new EntityVillager.PriceInfo(8, 10))),
+						Arrays.asList(
+								new EntityVillager.ListItemForEmeralds(Items.redstone,
+										new EntityVillager.PriceInfo(-4, -1)),
 								new EntityVillager.ListItemForEmeralds(
 										new ItemStack(Items.dye, 1, EnumDyeColor.BLUE.getDyeDamage()),
-										new EntityVillager.PriceInfo(-2, -1)) },
-						{ new EntityVillager.ListItemForEmeralds(Items.ender_eye, new EntityVillager.PriceInfo(7, 11)),
+										new EntityVillager.PriceInfo(-2, -1))),
+						Arrays.asList(
+								new EntityVillager.ListItemForEmeralds(Items.ender_eye,
+										new EntityVillager.PriceInfo(7, 11)),
 								new EntityVillager.ListItemForEmeralds(Item.getItemFromBlock(Blocks.glowstone),
-										new EntityVillager.PriceInfo(-3, -1)) },
-						{ new EntityVillager.ListItemForEmeralds(Items.experience_bottle,
-								new EntityVillager.PriceInfo(3, 11)) } } },
-				{ { { new EntityVillager.EmeraldForItems(Items.coal, new EntityVillager.PriceInfo(16, 24)),
-						new EntityVillager.ListItemForEmeralds(Items.iron_helmet, new EntityVillager.PriceInfo(4, 6)) },
-						{ new EntityVillager.EmeraldForItems(Items.iron_ingot, new EntityVillager.PriceInfo(7, 9)),
-								new EntityVillager.ListItemForEmeralds(Items.iron_chestplate,
-										new EntityVillager.PriceInfo(10, 14)) },
-						{ new EntityVillager.EmeraldForItems(Items.diamond, new EntityVillager.PriceInfo(3, 4)),
-								new EntityVillager.ListEnchantedItemForEmeralds(Items.diamond_chestplate,
-										new EntityVillager.PriceInfo(16, 19)) },
-						{ new EntityVillager.ListItemForEmeralds(Items.chainmail_boots,
-								new EntityVillager.PriceInfo(5, 7)),
-								new EntityVillager.ListItemForEmeralds(Items.chainmail_leggings,
-										new EntityVillager.PriceInfo(9, 11)),
-								new EntityVillager.ListItemForEmeralds(Items.chainmail_helmet,
-										new EntityVillager.PriceInfo(5, 7)),
-								new EntityVillager.ListItemForEmeralds(Items.chainmail_chestplate,
-										new EntityVillager.PriceInfo(11, 15)) } },
-						{ { new EntityVillager.EmeraldForItems(Items.coal, new EntityVillager.PriceInfo(16, 24)),
+										new EntityVillager.PriceInfo(-3, -1))),
+						Arrays.asList(new EntityVillager.ListItemForEmeralds(Items.experience_bottle,
+								new EntityVillager.PriceInfo(3, 11))))),
+				Arrays.asList(
+						Arrays.asList(Arrays.asList(
+								new EntityVillager.EmeraldForItems(Items.coal, new EntityVillager.PriceInfo(16, 24)),
+								new EntityVillager.ListItemForEmeralds(Items.iron_helmet,
+										new EntityVillager.PriceInfo(4, 6))),
+								Arrays.asList(
+										new EntityVillager.EmeraldForItems(Items.iron_ingot,
+												new EntityVillager.PriceInfo(7, 9)),
+										new EntityVillager.ListItemForEmeralds(Items.iron_chestplate,
+												new EntityVillager.PriceInfo(10, 14))),
+								Arrays.asList(
+										new EntityVillager.EmeraldForItems(Items.diamond,
+												new EntityVillager.PriceInfo(3, 4)),
+										new EntityVillager.ListEnchantedItemForEmeralds(Items.diamond_chestplate,
+												new EntityVillager.PriceInfo(16, 19))),
+								Arrays.asList(
+										new EntityVillager.ListItemForEmeralds(Items.chainmail_boots,
+												new EntityVillager.PriceInfo(5, 7)),
+										new EntityVillager.ListItemForEmeralds(Items.chainmail_leggings,
+												new EntityVillager.PriceInfo(9, 11)),
+										new EntityVillager.ListItemForEmeralds(Items.chainmail_helmet,
+												new EntityVillager.PriceInfo(5, 7)),
+										new EntityVillager.ListItemForEmeralds(Items.chainmail_chestplate,
+												new EntityVillager.PriceInfo(11, 15)))),
+						Arrays.asList(Arrays.asList(
+								new EntityVillager.EmeraldForItems(Items.coal, new EntityVillager.PriceInfo(16, 24)),
 								new EntityVillager.ListItemForEmeralds(Items.iron_axe,
-										new EntityVillager.PriceInfo(6, 8)) },
-								{ new EntityVillager.EmeraldForItems(Items.iron_ingot,
-										new EntityVillager.PriceInfo(7, 9)),
+										new EntityVillager.PriceInfo(6, 8))),
+								Arrays.asList(
+										new EntityVillager.EmeraldForItems(Items.iron_ingot,
+												new EntityVillager.PriceInfo(7, 9)),
 										new EntityVillager.ListEnchantedItemForEmeralds(Items.iron_sword,
-												new EntityVillager.PriceInfo(9, 10)) },
-								{ new EntityVillager.EmeraldForItems(Items.diamond, new EntityVillager.PriceInfo(3, 4)),
+												new EntityVillager.PriceInfo(9, 10))),
+								Arrays.asList(
+										new EntityVillager.EmeraldForItems(Items.diamond,
+												new EntityVillager.PriceInfo(3, 4)),
 										new EntityVillager.ListEnchantedItemForEmeralds(Items.diamond_sword,
 												new EntityVillager.PriceInfo(12, 15)),
 										new EntityVillager.ListEnchantedItemForEmeralds(Items.diamond_axe,
-												new EntityVillager.PriceInfo(9, 12)) } },
-						{ { new EntityVillager.EmeraldForItems(Items.coal, new EntityVillager.PriceInfo(16, 24)),
+												new EntityVillager.PriceInfo(9, 12)))),
+						Arrays.asList(Arrays.asList(
+								new EntityVillager.EmeraldForItems(Items.coal, new EntityVillager.PriceInfo(16, 24)),
 								new EntityVillager.ListEnchantedItemForEmeralds(Items.iron_shovel,
-										new EntityVillager.PriceInfo(5, 7)) },
-								{ new EntityVillager.EmeraldForItems(Items.iron_ingot,
-										new EntityVillager.PriceInfo(7, 9)),
+										new EntityVillager.PriceInfo(5, 7))),
+								Arrays.asList(
+										new EntityVillager.EmeraldForItems(Items.iron_ingot,
+												new EntityVillager.PriceInfo(7, 9)),
 										new EntityVillager.ListEnchantedItemForEmeralds(Items.iron_pickaxe,
-												new EntityVillager.PriceInfo(9, 11)) },
-								{ new EntityVillager.EmeraldForItems(Items.diamond, new EntityVillager.PriceInfo(3, 4)),
+												new EntityVillager.PriceInfo(9, 11))),
+								Arrays.asList(
+										new EntityVillager.EmeraldForItems(Items.diamond,
+												new EntityVillager.PriceInfo(3, 4)),
 										new EntityVillager.ListEnchantedItemForEmeralds(Items.diamond_pickaxe,
-												new EntityVillager.PriceInfo(12, 15)) } } },
-				{ { { new EntityVillager.EmeraldForItems(Items.porkchop, new EntityVillager.PriceInfo(14, 18)),
-						new EntityVillager.EmeraldForItems(Items.chicken, new EntityVillager.PriceInfo(14, 18)) },
-						{ new EntityVillager.EmeraldForItems(Items.coal, new EntityVillager.PriceInfo(16, 24)),
+												new EntityVillager.PriceInfo(12, 15))))),
+				Arrays.asList(Arrays.asList(Arrays.asList(
+						new EntityVillager.EmeraldForItems(Items.porkchop, new EntityVillager.PriceInfo(14, 18)),
+						new EntityVillager.EmeraldForItems(Items.chicken, new EntityVillager.PriceInfo(14, 18))),
+						Arrays.asList(
+								new EntityVillager.EmeraldForItems(Items.coal, new EntityVillager.PriceInfo(16, 24)),
 								new EntityVillager.ListItemForEmeralds(Items.cooked_porkchop,
 										new EntityVillager.PriceInfo(-7, -5)),
 								new EntityVillager.ListItemForEmeralds(Items.cooked_chicken,
-										new EntityVillager.PriceInfo(-8, -6)) } },
-						{ { new EntityVillager.EmeraldForItems(Items.leather, new EntityVillager.PriceInfo(9, 12)),
+										new EntityVillager.PriceInfo(-8, -6)))),
+						Arrays.asList(Arrays.asList(
+								new EntityVillager.EmeraldForItems(Items.leather, new EntityVillager.PriceInfo(9, 12)),
 								new EntityVillager.ListItemForEmeralds(Items.leather_leggings,
-										new EntityVillager.PriceInfo(2, 4)) },
-								{ new EntityVillager.ListEnchantedItemForEmeralds(Items.leather_chestplate,
-										new EntityVillager.PriceInfo(7, 12)) },
-								{ new EntityVillager.ListItemForEmeralds(Items.saddle,
-										new EntityVillager.PriceInfo(8, 10)) } } } };
+										new EntityVillager.PriceInfo(2, 4))),
+								Arrays.asList(new EntityVillager.ListEnchantedItemForEmeralds(Items.leather_chestplate,
+										new EntityVillager.PriceInfo(7, 12))),
+								Arrays.asList(new EntityVillager.ListItemForEmeralds(Items.saddle,
+										new EntityVillager.PriceInfo(8, 10))))));
 	}
 
 	public EntityVillager(World worldIn) {
@@ -349,7 +392,8 @@ public class EntityVillager extends EntityAgeable implements IMerchant, INpc {
 			--this.timeUntilReset;
 			if (this.timeUntilReset <= 0) {
 				if (this.needsInitilization) {
-					for (MerchantRecipe merchantrecipe : this.buyingList) {
+					for (int i = 0, l = this.buyingList.size(); i < l; ++i) {
+						MerchantRecipe merchantrecipe = this.buyingList.get(i);
 						if (merchantrecipe.isRecipeDisabled()) {
 							merchantrecipe.increaseMaxTradeUses(this.rand.nextInt(6) + this.rand.nextInt(6) + 2);
 						}
@@ -651,11 +695,12 @@ public class EntityVillager extends EntityAgeable implements IMerchant, INpc {
 	}
 
 	private void populateBuyingList() {
-		EntityVillager.ITradeList[][][] aentityvillager$itradelist = DEFAULT_TRADE_LIST_MAP[this.getProfession()];
+		List<List<List<EntityVillager.ITradeList>>> aentityvillager$itradelist = DEFAULT_TRADE_LIST_MAP
+				.get(this.getProfession());
 		if (this.careerId != 0 && this.careerLevel != 0) {
 			++this.careerLevel;
 		} else {
-			this.careerId = this.rand.nextInt(aentityvillager$itradelist.length) + 1;
+			this.careerId = this.rand.nextInt(aentityvillager$itradelist.size()) + 1;
 			this.careerLevel = 1;
 		}
 
@@ -665,12 +710,12 @@ public class EntityVillager extends EntityAgeable implements IMerchant, INpc {
 
 		int i = this.careerId - 1;
 		int j = this.careerLevel - 1;
-		EntityVillager.ITradeList[][] aentityvillager$itradelist1 = aentityvillager$itradelist[i];
-		if (j >= 0 && j < aentityvillager$itradelist1.length) {
-			EntityVillager.ITradeList[] aentityvillager$itradelist2 = aentityvillager$itradelist1[j];
+		List<List<EntityVillager.ITradeList>> aentityvillager$itradelist1 = aentityvillager$itradelist.get(i);
+		if (j >= 0 && j < aentityvillager$itradelist1.size()) {
+			List<EntityVillager.ITradeList> aentityvillager$itradelist2 = aentityvillager$itradelist1.get(j);
 
-			for (EntityVillager.ITradeList entityvillager$itradelist : aentityvillager$itradelist2) {
-				entityvillager$itradelist.modifyMerchantRecipeList(this.buyingList, this.rand);
+			for (int k = 0, l = aentityvillager$itradelist2.size(); k < l; ++k) {
+				aentityvillager$itradelist2.get(k).modifyMerchantRecipeList(this.buyingList, this.rand);
 			}
 		}
 
diff --git a/src/main/java/net/minecraft/entity/passive/EntityWolf.java b/src/main/java/net/minecraft/entity/passive/EntityWolf.java
index 5641010..0beb897 100755
--- a/src/main/java/net/minecraft/entity/passive/EntityWolf.java
+++ b/src/main/java/net/minecraft/entity/passive/EntityWolf.java
@@ -125,9 +125,9 @@ public class EntityWolf extends EntityTameable {
 
 	protected void entityInit() {
 		super.entityInit();
-		this.dataWatcher.addObject(18, new Float(this.getHealth()));
-		this.dataWatcher.addObject(19, new Byte((byte) 0));
-		this.dataWatcher.addObject(20, new Byte((byte) EnumDyeColor.RED.getMetadata()));
+		this.dataWatcher.addObject(18, Float.valueOf(this.getHealth()));
+		this.dataWatcher.addObject(19, Byte.valueOf((byte) 0));
+		this.dataWatcher.addObject(20, Byte.valueOf((byte) EnumDyeColor.RED.getMetadata()));
 	}
 
 	protected void playStepSound(BlockPos var1, Block var2) {
diff --git a/src/main/java/net/minecraft/entity/player/EntityPlayer.java b/src/main/java/net/minecraft/entity/player/EntityPlayer.java
index cb37359..1cf27ce 100755
--- a/src/main/java/net/minecraft/entity/player/EntityPlayer.java
+++ b/src/main/java/net/minecraft/entity/player/EntityPlayer.java
@@ -945,8 +945,9 @@ public abstract class EntityPlayer extends EntityLivingBase implements ICommandS
 	public float getArmorVisibility() {
 		int i = 0;
 
-		for (ItemStack itemstack : this.inventory.armorInventory) {
-			if (itemstack != null) {
+		ItemStack[] stack = this.inventory.armorInventory;
+		for (int j = 0; j < stack.length; ++j) {
+			if (stack[j] != null) {
 				++i;
 			}
 		}
@@ -2054,7 +2055,7 @@ public abstract class EntityPlayer extends EntityLivingBase implements ICommandS
 		FULL(0, "options.chat.visibility.full"), SYSTEM(1, "options.chat.visibility.system"),
 		HIDDEN(2, "options.chat.visibility.hidden");
 
-		private static final EntityPlayer.EnumChatVisibility[] ID_LOOKUP = new EntityPlayer.EnumChatVisibility[values().length];
+		private static final EntityPlayer.EnumChatVisibility[] ID_LOOKUP = new EntityPlayer.EnumChatVisibility[3];
 		private final int chatVisibility;
 		private final String resourceKey;
 
@@ -2076,8 +2077,9 @@ public abstract class EntityPlayer extends EntityLivingBase implements ICommandS
 		}
 
 		static {
-			for (EntityPlayer.EnumChatVisibility entityplayer$enumchatvisibility : values()) {
-				ID_LOOKUP[entityplayer$enumchatvisibility.chatVisibility] = entityplayer$enumchatvisibility;
+			EntityPlayer.EnumChatVisibility[] lst = values();
+			for (int i = 0; i < lst.length; ++i) {
+				ID_LOOKUP[lst[i].chatVisibility] = lst[i];
 			}
 
 		}
diff --git a/src/main/java/net/minecraft/entity/player/EntityPlayerMP.java b/src/main/java/net/minecraft/entity/player/EntityPlayerMP.java
index ac48f25..6462174 100755
--- a/src/main/java/net/minecraft/entity/player/EntityPlayerMP.java
+++ b/src/main/java/net/minecraft/entity/player/EntityPlayerMP.java
@@ -21,7 +21,6 @@ import net.minecraft.entity.EntityList;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.IMerchant;
 import net.minecraft.entity.passive.EntityHorse;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.projectile.EntityArrow;
 import net.minecraft.init.Items;
 import net.minecraft.inventory.Container;
@@ -329,12 +328,12 @@ public class EntityPlayerMP extends EntityPlayer implements ICrafting {
 					this.playerNetServerHandler.sendPacket(new S26PacketMapChunkBulk(arraylist));
 				}
 
-				for (TileEntity tileentity : (ArrayList<TileEntity>) arraylist1) {
-					this.sendTileEntityUpdate(tileentity);
+				for (int i = 0, l = arraylist1.size(); i < l; ++i) {
+					this.sendTileEntityUpdate((TileEntity) arraylist1.get(i));
 				}
 
-				for (Chunk chunk1 : (ArrayList<Chunk>) arraylist) {
-					this.getServerForPlayer().getEntityTracker().func_85172_a(this, chunk1);
+				for (int i = 0, l = arraylist.size(); i < l; ++i) {
+					this.getServerForPlayer().getEntityTracker().func_85172_a(this, (Chunk) arraylist.get(i));
 				}
 			}
 		}
diff --git a/src/main/java/net/minecraft/entity/player/EnumPlayerModelParts.java b/src/main/java/net/minecraft/entity/player/EnumPlayerModelParts.java
index be9a234..dafb46b 100755
--- a/src/main/java/net/minecraft/entity/player/EnumPlayerModelParts.java
+++ b/src/main/java/net/minecraft/entity/player/EnumPlayerModelParts.java
@@ -27,6 +27,8 @@ public enum EnumPlayerModelParts {
 	CAPE(0, "cape"), JACKET(1, "jacket"), LEFT_SLEEVE(2, "left_sleeve"), RIGHT_SLEEVE(3, "right_sleeve"),
 	LEFT_PANTS_LEG(4, "left_pants_leg"), RIGHT_PANTS_LEG(5, "right_pants_leg"), HAT(6, "hat");
 
+	public static final EnumPlayerModelParts[] _VALUES = values();
+
 	private final int partId;
 	private final int partMask;
 	private final String partName;
diff --git a/src/main/java/net/minecraft/entity/projectile/EntityPotion.java b/src/main/java/net/minecraft/entity/projectile/EntityPotion.java
index e939722..80c601c 100755
--- a/src/main/java/net/minecraft/entity/projectile/EntityPotion.java
+++ b/src/main/java/net/minecraft/entity/projectile/EntityPotion.java
@@ -106,7 +106,8 @@ public class EntityPotion extends EntityThrowable {
 				AxisAlignedBB axisalignedbb = this.getEntityBoundingBox().expand(4.0D, 2.0D, 4.0D);
 				List list1 = this.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb);
 				if (!list1.isEmpty()) {
-					for (EntityLivingBase entitylivingbase : (List<EntityLivingBase>) list1) {
+					for (int k = 0, l = list1.size(); k < l; ++k) {
+						EntityLivingBase entitylivingbase = (EntityLivingBase) list1.get(k);
 						double d0 = this.getDistanceSqToEntity(entitylivingbase);
 						if (d0 < 16.0D) {
 							double d1 = 1.0D - Math.sqrt(d0) / 4.0D;
@@ -114,7 +115,8 @@ public class EntityPotion extends EntityThrowable {
 								d1 = 1.0D;
 							}
 
-							for (PotionEffect potioneffect : (List<PotionEffect>) list) {
+							for (int m = 0, n = list.size(); m < n; ++m) {
+								PotionEffect potioneffect = (PotionEffect) list.get(m);
 								int i = potioneffect.getPotionID();
 								if (Potion.potionTypes[i].isInstant()) {
 									Potion.potionTypes[i].affectEntity(this, this.getThrower(), entitylivingbase,
diff --git a/src/main/java/net/minecraft/event/ClickEvent.java b/src/main/java/net/minecraft/event/ClickEvent.java
index 5a59851..652af50 100755
--- a/src/main/java/net/minecraft/event/ClickEvent.java
+++ b/src/main/java/net/minecraft/event/ClickEvent.java
@@ -109,8 +109,9 @@ public class ClickEvent {
 		}
 
 		static {
-			for (ClickEvent.Action clickevent$action : values()) {
-				nameMapping.put(clickevent$action.getCanonicalName(), clickevent$action);
+			ClickEvent.Action[] types = values();
+			for (int i = 0; i < types.length; ++i) {
+				nameMapping.put(types[i].getCanonicalName(), types[i]);
 			}
 
 		}
diff --git a/src/main/java/net/minecraft/event/HoverEvent.java b/src/main/java/net/minecraft/event/HoverEvent.java
index ffaca2c..70b2fc1 100755
--- a/src/main/java/net/minecraft/event/HoverEvent.java
+++ b/src/main/java/net/minecraft/event/HoverEvent.java
@@ -110,8 +110,9 @@ public class HoverEvent {
 		}
 
 		static {
-			for (HoverEvent.Action hoverevent$action : values()) {
-				nameMapping.put(hoverevent$action.getCanonicalName(), hoverevent$action);
+			HoverEvent.Action[] types = values();
+			for (int i = 0; i < types.length; ++i) {
+				nameMapping.put(types[i].getCanonicalName(), types[i]);
 			}
 
 		}
diff --git a/src/main/java/net/minecraft/init/Bootstrap.java b/src/main/java/net/minecraft/init/Bootstrap.java
index a67e2d8..00f51c0 100755
--- a/src/main/java/net/minecraft/init/Bootstrap.java
+++ b/src/main/java/net/minecraft/init/Bootstrap.java
@@ -33,8 +33,6 @@ import net.minecraft.entity.projectile.EntityEgg;
 import net.minecraft.entity.projectile.EntityPotion;
 import net.minecraft.entity.projectile.EntitySmallFireball;
 import net.minecraft.entity.projectile.EntitySnowball;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
 import net.minecraft.item.EnumDyeColor;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemAxe;
diff --git a/src/main/java/net/minecraft/item/EnumDyeColor.java b/src/main/java/net/minecraft/item/EnumDyeColor.java
index 161e9cb..322082f 100755
--- a/src/main/java/net/minecraft/item/EnumDyeColor.java
+++ b/src/main/java/net/minecraft/item/EnumDyeColor.java
@@ -42,8 +42,8 @@ public enum EnumDyeColor implements IStringSerializable {
 	RED(14, 1, "red", "red", MapColor.redColor, EnumChatFormatting.DARK_RED),
 	BLACK(15, 0, "black", "black", MapColor.blackColor, EnumChatFormatting.BLACK);
 
-	private static final EnumDyeColor[] META_LOOKUP = new EnumDyeColor[values().length];
-	private static final EnumDyeColor[] DYE_DMG_LOOKUP = new EnumDyeColor[values().length];
+	public static final EnumDyeColor[] META_LOOKUP = new EnumDyeColor[16];
+	public static final EnumDyeColor[] DYE_DMG_LOOKUP = new EnumDyeColor[16];
 	private final int meta;
 	private final int dyeDamage;
 	private final String name;
@@ -102,7 +102,9 @@ public enum EnumDyeColor implements IStringSerializable {
 	}
 
 	static {
-		for (EnumDyeColor enumdyecolor : values()) {
+		EnumDyeColor[] colors = values();
+		for (int i = 0; i < colors.length; ++i) {
+			EnumDyeColor enumdyecolor = colors[i];
 			META_LOOKUP[enumdyecolor.getMetadata()] = enumdyecolor;
 			DYE_DMG_LOOKUP[enumdyecolor.getDyeDamage()] = enumdyecolor;
 		}
diff --git a/src/main/java/net/minecraft/item/ItemBanner.java b/src/main/java/net/minecraft/item/ItemBanner.java
index 5b097b3..06ab518 100755
--- a/src/main/java/net/minecraft/item/ItemBanner.java
+++ b/src/main/java/net/minecraft/item/ItemBanner.java
@@ -129,7 +129,9 @@ public class ItemBanner extends ItemBlock {
 	 * (eg: dye returns 16 items)
 	 */
 	public void getSubItems(Item item, CreativeTabs var2, List<ItemStack> list) {
-		for (EnumDyeColor enumdyecolor : EnumDyeColor.values()) {
+		EnumDyeColor[] colors = EnumDyeColor.META_LOOKUP;
+		for (int i = 0; i < colors.length; ++i) {
+			EnumDyeColor enumdyecolor = colors[i];
 			NBTTagCompound nbttagcompound = new NBTTagCompound();
 			TileEntityBanner.func_181020_a(nbttagcompound, enumdyecolor.getDyeDamage(), (NBTTagList) null);
 			NBTTagCompound nbttagcompound1 = new NBTTagCompound();
diff --git a/src/main/java/net/minecraft/item/ItemFireworkCharge.java b/src/main/java/net/minecraft/item/ItemFireworkCharge.java
index 80df298..94bf912 100755
--- a/src/main/java/net/minecraft/item/ItemFireworkCharge.java
+++ b/src/main/java/net/minecraft/item/ItemFireworkCharge.java
@@ -46,7 +46,8 @@ public class ItemFireworkCharge extends Item {
 					int k = 0;
 					int l = 0;
 
-					for (int i1 : aint) {
+					for (int m = 0; m < aint.length; ++m) {
+						int i1 = aint[m];
 						j += (i1 & 16711680) >> 16;
 						k += (i1 & '\uff00') >> 8;
 						l += (i1 & 255) >> 0;
@@ -99,7 +100,8 @@ public class ItemFireworkCharge extends Item {
 			boolean flag = true;
 			String s = "";
 
-			for (int i : aint) {
+			for (int m = 0; m < aint.length; ++m) {
+				int i = aint[m];
 				if (!flag) {
 					s = s + ", ";
 				}
@@ -129,7 +131,8 @@ public class ItemFireworkCharge extends Item {
 			boolean flag2 = true;
 			String s1 = StatCollector.translateToLocal("item.fireworksCharge.fadeTo") + " ";
 
-			for (int l : aint1) {
+			for (int m = 0; m < aint1.length; ++m) {
+				int l = aint1[m];
 				if (!flag2) {
 					s1 = s1 + ", ";
 				}
diff --git a/src/main/java/net/minecraft/item/ItemFishFood.java b/src/main/java/net/minecraft/item/ItemFishFood.java
index d56c7aa..073a2aa 100755
--- a/src/main/java/net/minecraft/item/ItemFishFood.java
+++ b/src/main/java/net/minecraft/item/ItemFishFood.java
@@ -74,7 +74,9 @@ public class ItemFishFood extends ItemFood {
 	 * (eg: dye returns 16 items)
 	 */
 	public void getSubItems(Item var1, CreativeTabs var2, List<ItemStack> list) {
-		for (ItemFishFood.FishType itemfishfood$fishtype : ItemFishFood.FishType.values()) {
+		ItemFishFood.FishType[] types = ItemFishFood.FishType.values();
+		for (int i = 0; i < types.length; ++i) {
+			ItemFishFood.FishType itemfishfood$fishtype = types[i];
 			if (!this.cooked || itemfishfood$fishtype.canCook()) {
 				list.add(new ItemStack(this, 1, itemfishfood$fishtype.getMetadata()));
 			}
@@ -171,8 +173,9 @@ public class ItemFishFood extends ItemFood {
 		}
 
 		static {
-			for (ItemFishFood.FishType itemfishfood$fishtype : values()) {
-				META_LOOKUP.put(Integer.valueOf(itemfishfood$fishtype.getMetadata()), itemfishfood$fishtype);
+			ItemFishFood.FishType[] types = values();
+			for (int i = 0; i < types.length; ++i) {
+				META_LOOKUP.put(Integer.valueOf(types[i].getMetadata()), types[i]);
 			}
 
 		}
diff --git a/src/main/java/net/minecraft/item/ItemLead.java b/src/main/java/net/minecraft/item/ItemLead.java
index 4f21635..b82c523 100755
--- a/src/main/java/net/minecraft/item/ItemLead.java
+++ b/src/main/java/net/minecraft/item/ItemLead.java
@@ -1,5 +1,7 @@
 package net.minecraft.item;
 
+import java.util.List;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockFence;
 import net.minecraft.creativetab.CreativeTabs;
@@ -62,9 +64,10 @@ public class ItemLead extends Item {
 		int j = fence.getY();
 		int k = fence.getZ();
 
-		for (EntityLiving entityliving : worldIn.getEntitiesWithinAABB(EntityLiving.class,
-				new AxisAlignedBB((double) i - d0, (double) j - d0, (double) k - d0, (double) i + d0, (double) j + d0,
-						(double) k + d0))) {
+		List<EntityLiving> lst = worldIn.getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB((double) i - d0,
+				(double) j - d0, (double) k - d0, (double) i + d0, (double) j + d0, (double) k + d0));
+		for (int m = 0, l = lst.size(); m < l; ++m) {
+			EntityLiving entityliving = lst.get(m);
 			if (entityliving.getLeashed() && entityliving.getLeashedToEntity() == player) {
 				if (entityleashknot == null) {
 					entityleashknot = EntityLeashKnot.createKnot(worldIn, fence);
diff --git a/src/main/java/net/minecraft/item/ItemMonsterPlacer.java b/src/main/java/net/minecraft/item/ItemMonsterPlacer.java
index 04d5ed3..4862159 100755
--- a/src/main/java/net/minecraft/item/ItemMonsterPlacer.java
+++ b/src/main/java/net/minecraft/item/ItemMonsterPlacer.java
@@ -12,8 +12,6 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.IEntityLivingData;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
 import net.minecraft.stats.StatList;
 import net.minecraft.tileentity.MobSpawnerBaseLogic;
 import net.minecraft.tileentity.TileEntity;
diff --git a/src/main/java/net/minecraft/item/ItemPotion.java b/src/main/java/net/minecraft/item/ItemPotion.java
index c5f140b..05b4f03 100755
--- a/src/main/java/net/minecraft/item/ItemPotion.java
+++ b/src/main/java/net/minecraft/item/ItemPotion.java
@@ -112,10 +112,10 @@ public class ItemPotion extends Item {
 		}
 
 		if (!world.isRemote) {
-			List list = this.getEffects(itemstack);
+			List<PotionEffect> list = this.getEffects(itemstack);
 			if (list != null) {
-				for (PotionEffect potioneffect : (List<PotionEffect>) list) {
-					entityplayer.addPotionEffect(new PotionEffect(potioneffect));
+				for (int i = 0, l = list.size(); i < l; ++i) {
+					entityplayer.addPotionEffect(new PotionEffect(list.get(i)));
 				}
 			}
 		}
@@ -187,10 +187,10 @@ public class ItemPotion extends Item {
 	}
 
 	public boolean isEffectInstant(int meta) {
-		List list = this.getEffects(meta);
+		List<PotionEffect> list = this.getEffects(meta);
 		if (list != null && !list.isEmpty()) {
-			for (PotionEffect potioneffect : (List<PotionEffect>) list) {
-				if (Potion.potionTypes[potioneffect.getPotionID()].isInstant()) {
+			for (int i = 0, l = list.size(); i < l; ++i) {
+				if (Potion.potionTypes[list.get(i).getPotionID()].isInstant()) {
 					return true;
 				}
 			}
@@ -228,10 +228,11 @@ public class ItemPotion extends Item {
 	 */
 	public void addInformation(ItemStack itemstack, EntityPlayer var2, List<String> list, boolean var4) {
 		if (itemstack.getMetadata() != 0) {
-			List list1 = Items.potionitem.getEffects(itemstack);
+			List<PotionEffect> list1 = Items.potionitem.getEffects(itemstack);
 			HashMultimap hashmultimap = HashMultimap.create();
 			if (list1 != null && !list1.isEmpty()) {
-				for (PotionEffect potioneffect : (List<PotionEffect>) list1) {
+				for (int i = 0, l = list1.size(); i < l; ++i) {
+					PotionEffect potioneffect = list1.get(i);
 					String s1 = StatCollector.translateToLocal(potioneffect.getEffectName()).trim();
 					Potion potion = Potion.potionTypes[potioneffect.getPotionID()];
 					Map map = potion.getAttributeModifierMap();
diff --git a/src/main/java/net/minecraft/item/crafting/CraftingManager.java b/src/main/java/net/minecraft/item/crafting/CraftingManager.java
index e312086..1405551 100755
--- a/src/main/java/net/minecraft/item/crafting/CraftingManager.java
+++ b/src/main/java/net/minecraft/item/crafting/CraftingManager.java
@@ -445,7 +445,8 @@ public class CraftingManager {
 	public void addShapelessRecipe(ItemStack stack, Object... recipeComponents) {
 		ArrayList arraylist = Lists.newArrayList();
 
-		for (Object object : recipeComponents) {
+		for (int i = 0; i < recipeComponents.length; ++i) {
+			Object object = recipeComponents[i];
 			if (object instanceof ItemStack) {
 				arraylist.add(((ItemStack) object).copy());
 			} else if (object instanceof Item) {
@@ -474,7 +475,8 @@ public class CraftingManager {
 	 * Retrieves an ItemStack that has multiple recipes for it.
 	 */
 	public ItemStack findMatchingRecipe(InventoryCrafting worldIn, World parWorld) {
-		for (IRecipe irecipe : this.recipes) {
+		for (int i = 0, l = this.recipes.size(); i < l; ++i) {
+			IRecipe irecipe = this.recipes.get(i);
 			if (irecipe.matches(worldIn, parWorld)) {
 				return irecipe.getCraftingResult(worldIn);
 			}
@@ -484,7 +486,8 @@ public class CraftingManager {
 	}
 
 	public ItemStack[] func_180303_b(InventoryCrafting worldIn, World parWorld) {
-		for (IRecipe irecipe : this.recipes) {
+		for (int i = 0, l = this.recipes.size(); i < l; ++i) {
+			IRecipe irecipe = this.recipes.get(i);
 			if (irecipe.matches(worldIn, parWorld)) {
 				return irecipe.getRemainingItems(worldIn);
 			}
diff --git a/src/main/java/net/minecraft/item/crafting/FurnaceRecipes.java b/src/main/java/net/minecraft/item/crafting/FurnaceRecipes.java
index 65de66a..17439ca 100755
--- a/src/main/java/net/minecraft/item/crafting/FurnaceRecipes.java
+++ b/src/main/java/net/minecraft/item/crafting/FurnaceRecipes.java
@@ -73,7 +73,9 @@ public class FurnaceRecipes {
 		this.addSmeltingRecipeForBlock(Blocks.netherrack, new ItemStack(Items.netherbrick), 0.1F);
 		this.addSmeltingRecipe(new ItemStack(Blocks.sponge, 1, 1), new ItemStack(Blocks.sponge, 1, 0), 0.15F);
 
-		for (ItemFishFood.FishType itemfishfood$fishtype : ItemFishFood.FishType.values()) {
+		ItemFishFood.FishType[] types = ItemFishFood.FishType.values();
+		for (int i = 0; i < types.length; ++i) {
+			ItemFishFood.FishType itemfishfood$fishtype = types[i];
 			if (itemfishfood$fishtype.canCook()) {
 				this.addSmeltingRecipe(new ItemStack(Items.fish, 1, itemfishfood$fishtype.getMetadata()),
 						new ItemStack(Items.cooked_fish, 1, itemfishfood$fishtype.getMetadata()), 0.35F);
diff --git a/src/main/java/net/minecraft/item/crafting/RecipesBanners.java b/src/main/java/net/minecraft/item/crafting/RecipesBanners.java
index 34c14af..d8e00de 100755
--- a/src/main/java/net/minecraft/item/crafting/RecipesBanners.java
+++ b/src/main/java/net/minecraft/item/crafting/RecipesBanners.java
@@ -35,7 +35,9 @@ public class RecipesBanners {
 	 * Adds the banner recipes to the CraftingManager.
 	 */
 	void addRecipes(CraftingManager parCraftingManager) {
-		for (EnumDyeColor enumdyecolor : EnumDyeColor.values()) {
+		EnumDyeColor[] colors = EnumDyeColor.META_LOOKUP;
+		for (int i = 0; i < colors.length; ++i) {
+			EnumDyeColor enumdyecolor = colors[i];
 			parCraftingManager.addRecipe(new ItemStack(Items.banner, 1, enumdyecolor.getDyeDamage()),
 					new Object[] { "###", "###", " | ", Character.valueOf('#'),
 							new ItemStack(Blocks.wool, 1, enumdyecolor.getMetadata()), Character.valueOf('|'),
@@ -140,8 +142,9 @@ public class RecipesBanners {
 		}
 
 		private TileEntityBanner.EnumBannerPattern func_179533_c(InventoryCrafting parInventoryCrafting) {
-			for (TileEntityBanner.EnumBannerPattern tileentitybanner$enumbannerpattern : TileEntityBanner.EnumBannerPattern
-					.values()) {
+			TileEntityBanner.EnumBannerPattern[] patterns = TileEntityBanner.EnumBannerPattern._VALUES;
+			for (int m = 0; m < patterns.length; ++m) {
+				TileEntityBanner.EnumBannerPattern tileentitybanner$enumbannerpattern = patterns[m];
 				if (tileentitybanner$enumbannerpattern.hasValidCrafting()) {
 					boolean flag = true;
 					if (tileentitybanner$enumbannerpattern.hasCraftingStack()) {
diff --git a/src/main/java/net/minecraft/item/crafting/ShapelessRecipes.java b/src/main/java/net/minecraft/item/crafting/ShapelessRecipes.java
index 330a365..e085b0b 100755
--- a/src/main/java/net/minecraft/item/crafting/ShapelessRecipes.java
+++ b/src/main/java/net/minecraft/item/crafting/ShapelessRecipes.java
@@ -59,7 +59,7 @@ public class ShapelessRecipes implements IRecipe {
 	 * Used to check if a recipe matches current crafting inventory
 	 */
 	public boolean matches(InventoryCrafting inventorycrafting, World var2) {
-		ArrayList arraylist = Lists.newArrayList(this.recipeItems);
+		ArrayList<ItemStack> arraylist = Lists.newArrayList(this.recipeItems);
 
 		for (int i = 0; i < inventorycrafting.getHeight(); ++i) {
 			for (int j = 0; j < inventorycrafting.getWidth(); ++j) {
@@ -67,7 +67,8 @@ public class ShapelessRecipes implements IRecipe {
 				if (itemstack != null) {
 					boolean flag = false;
 
-					for (ItemStack itemstack1 : (List<ItemStack>) arraylist) {
+					for (int m = 0, l = arraylist.size(); m < l; ++m) {
+						ItemStack itemstack1 = arraylist.get(m);
 						if (itemstack.getItem() == itemstack1.getItem() && (itemstack1.getMetadata() == 32767
 								|| itemstack.getMetadata() == itemstack1.getMetadata())) {
 							flag = true;
diff --git a/src/main/java/net/minecraft/nbt/JsonToNBT.java b/src/main/java/net/minecraft/nbt/JsonToNBT.java
index 1af43a8..a4efcd6 100755
--- a/src/main/java/net/minecraft/nbt/JsonToNBT.java
+++ b/src/main/java/net/minecraft/nbt/JsonToNBT.java
@@ -312,7 +312,8 @@ public class JsonToNBT {
 		public NBTBase parse() throws NBTException {
 			NBTTagCompound nbttagcompound = new NBTTagCompound();
 
-			for (JsonToNBT.Any jsontonbt$any : this.field_150491_b) {
+			for (int i = 0, l = this.field_150491_b.size(); i < l; ++i) {
+				JsonToNBT.Any jsontonbt$any = this.field_150491_b.get(i);
 				nbttagcompound.setTag(jsontonbt$any.json, jsontonbt$any.parse());
 			}
 
@@ -330,8 +331,8 @@ public class JsonToNBT {
 		public NBTBase parse() throws NBTException {
 			NBTTagList nbttaglist = new NBTTagList();
 
-			for (JsonToNBT.Any jsontonbt$any : this.field_150492_b) {
-				nbttaglist.appendTag(jsontonbt$any.parse());
+			for (int i = 0, l = this.field_150492_b.size(); i < l; ++i) {
+				nbttaglist.appendTag(this.field_150492_b.get(i).parse());
 			}
 
 			return nbttaglist;
diff --git a/src/main/java/net/minecraft/nbt/NBTTagIntArray.java b/src/main/java/net/minecraft/nbt/NBTTagIntArray.java
index c0eae49..8432ba5 100755
--- a/src/main/java/net/minecraft/nbt/NBTTagIntArray.java
+++ b/src/main/java/net/minecraft/nbt/NBTTagIntArray.java
@@ -70,8 +70,8 @@ public class NBTTagIntArray extends NBTBase {
 	public String toString() {
 		String s = "[";
 
-		for (int i : this.intArray) {
-			s = s + i + ",";
+		for (int i = 0; i < this.intArray.length; ++i) {
+			s = s + this.intArray[i] + ",";
 		}
 
 		return s + "]";
diff --git a/src/main/java/net/minecraft/nbt/NBTTagList.java b/src/main/java/net/minecraft/nbt/NBTTagList.java
index eed8361..b3853d0 100755
--- a/src/main/java/net/minecraft/nbt/NBTTagList.java
+++ b/src/main/java/net/minecraft/nbt/NBTTagList.java
@@ -234,8 +234,8 @@ public class NBTTagList extends NBTBase {
 		NBTTagList nbttaglist = new NBTTagList();
 		nbttaglist.tagType = this.tagType;
 
-		for (NBTBase nbtbase : this.tagList) {
-			NBTBase nbtbase1 = nbtbase.copy();
+		for (int i = 0, l = this.tagList.size(); i < l; ++i) {
+			NBTBase nbtbase1 = this.tagList.get(i).copy();
 			nbttaglist.tagList.add(nbtbase1);
 		}
 
diff --git a/src/main/java/net/minecraft/network/EnumConnectionState.java b/src/main/java/net/minecraft/network/EnumConnectionState.java
index 206ab41..773529b 100755
--- a/src/main/java/net/minecraft/network/EnumConnectionState.java
+++ b/src/main/java/net/minecraft/network/EnumConnectionState.java
@@ -6,8 +6,6 @@ import com.google.common.collect.Maps;
 
 import java.util.Collection;
 import java.util.Map;
-import net.minecraft.network.EnumPacketDirection;
-import net.minecraft.network.Packet;
 import net.minecraft.network.handshake.client.C00Handshake;
 import net.minecraft.network.login.client.C00PacketLoginStart;
 import net.minecraft.network.login.client.C01PacketEncryptionResponse;
@@ -306,7 +304,9 @@ public enum EnumConnectionState {
 	}
 
 	static {
-		for (EnumConnectionState enumconnectionstate : values()) {
+		EnumConnectionState[] states = values();
+		for (int j = 0; j < states.length; ++j) {
+			EnumConnectionState enumconnectionstate = states[j];
 			int i = enumconnectionstate.getId();
 			if (i < field_181136_e || i > field_181137_f) {
 				throw new Error("Invalid protocol ID " + Integer.toString(i));
diff --git a/src/main/java/net/minecraft/network/NetHandlerPlayServer.java b/src/main/java/net/minecraft/network/NetHandlerPlayServer.java
index a882a01..300a241 100755
--- a/src/main/java/net/minecraft/network/NetHandlerPlayServer.java
+++ b/src/main/java/net/minecraft/network/NetHandlerPlayServer.java
@@ -7,7 +7,7 @@ import net.lax1dude.eaglercraft.v1_8.netty.Unpooled;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Date;
+import java.util.List;
 import java.util.Set;
 import java.util.concurrent.Callable;
 
@@ -37,8 +37,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.item.ItemWritableBook;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagString;
-import net.minecraft.network.Packet;
-import net.minecraft.network.PacketBuffer;
 import net.minecraft.network.play.INetHandlerPlayServer;
 import net.minecraft.network.play.client.C00PacketKeepAlive;
 import net.minecraft.network.play.client.C01PacketChatMessage;
@@ -582,7 +580,9 @@ public class NetHandlerPlayServer implements INetHandlerPlayServer, ITickable {
 		if (this.playerEntity.isSpectator()) {
 			Entity entity = null;
 
-			for (WorldServer worldserver : this.serverController.worldServers) {
+			WorldServer[] srv = this.serverController.worldServers;
+			for (int i = 0; i < srv.length; ++i) {
+				WorldServer worldserver = srv[i];
 				if (worldserver != null) {
 					entity = c18packetspectate.getEntity(worldserver);
 					if (entity != null) {
@@ -1064,15 +1064,14 @@ public class NetHandlerPlayServer implements INetHandlerPlayServer, ITickable {
 	 * string and sends them to the client
 	 */
 	public void processTabComplete(C14PacketTabComplete c14packettabcomplete) {
-		ArrayList arraylist = Lists.newArrayList();
-
-		for (String s : this.serverController.getTabCompletions(this.playerEntity, c14packettabcomplete.getMessage(),
-				c14packettabcomplete.getTargetBlock())) {
-			arraylist.add(s);
+		List<String> lst = this.serverController.getTabCompletions(this.playerEntity, c14packettabcomplete.getMessage(),
+				c14packettabcomplete.getTargetBlock());
+		String[] fuckOff = new String[lst.size()];
+		for (int i = 0; i < fuckOff.length; ++i) {
+			fuckOff[i] = lst.get(i);
 		}
 
-		this.playerEntity.playerNetServerHandler
-				.sendPacket(new S3APacketTabComplete((String[]) arraylist.toArray(new String[arraylist.size()])));
+		this.playerEntity.playerNetServerHandler.sendPacket(new S3APacketTabComplete(fuckOff));
 	}
 
 	/**+
@@ -1246,7 +1245,9 @@ public class NetHandlerPlayServer implements INetHandlerPlayServer, ITickable {
 				byte[] cert = new byte[pb.readableBytes()];
 				pb.readBytes(cert);
 				playerEntity.updateCertificate = cert;
-				for (EntityPlayerMP player : playerEntity.mcServer.getConfigurationManager().func_181057_v()) {
+				List<EntityPlayerMP> lst = playerEntity.mcServer.getConfigurationManager().func_181057_v();
+				for (int i = 0, l = lst.size(); i < l; ++i) {
+					EntityPlayerMP player = lst.get(i);
 					if (player != playerEntity) {
 						player.playerNetServerHandler.sendPacket(new S3FPacketCustomPayload("EAG|UpdateCert-1.8",
 								new PacketBuffer(Unpooled.buffer(cert, cert.length).writerIndex(cert.length))));
diff --git a/src/main/java/net/minecraft/network/play/server/S08PacketPlayerPosLook.java b/src/main/java/net/minecraft/network/play/server/S08PacketPlayerPosLook.java
index 283aa16..7f8701c 100755
--- a/src/main/java/net/minecraft/network/play/server/S08PacketPlayerPosLook.java
+++ b/src/main/java/net/minecraft/network/play/server/S08PacketPlayerPosLook.java
@@ -124,7 +124,9 @@ public class S08PacketPlayerPosLook implements Packet<INetHandlerPlayClient> {
 		public static Set<S08PacketPlayerPosLook.EnumFlags> func_180053_a(int parInt1) {
 			EnumSet enumset = EnumSet.noneOf(S08PacketPlayerPosLook.EnumFlags.class);
 
-			for (S08PacketPlayerPosLook.EnumFlags s08packetplayerposlook$enumflags : values()) {
+			S08PacketPlayerPosLook.EnumFlags[] types = values();
+			for (int i = 0; i < types.length; ++i) {
+				S08PacketPlayerPosLook.EnumFlags s08packetplayerposlook$enumflags = types[i];
 				if (s08packetplayerposlook$enumflags.func_180054_b(parInt1)) {
 					enumset.add(s08packetplayerposlook$enumflags);
 				}
diff --git a/src/main/java/net/minecraft/network/play/server/S21PacketChunkData.java b/src/main/java/net/minecraft/network/play/server/S21PacketChunkData.java
index d363e72..202ecd3 100755
--- a/src/main/java/net/minecraft/network/play/server/S21PacketChunkData.java
+++ b/src/main/java/net/minecraft/network/play/server/S21PacketChunkData.java
@@ -93,7 +93,7 @@ public class S21PacketChunkData implements Packet<INetHandlerPlayClient> {
 			int parInt1) {
 		ExtendedBlockStorage[] aextendedblockstorage = parChunk.getBlockStorageArray();
 		S21PacketChunkData.Extracted s21packetchunkdata$extracted = new S21PacketChunkData.Extracted();
-		ArrayList arraylist = Lists.newArrayList();
+		ArrayList<ExtendedBlockStorage> arraylist = Lists.newArrayList();
 
 		for (int i = 0; i < aextendedblockstorage.length; ++i) {
 			ExtendedBlockStorage extendedblockstorage = aextendedblockstorage[i];
@@ -107,25 +107,24 @@ public class S21PacketChunkData implements Packet<INetHandlerPlayClient> {
 		s21packetchunkdata$extracted.data = new byte[func_180737_a(
 				Integer.bitCount(s21packetchunkdata$extracted.dataSize), parFlag2, parFlag)];
 		int j = 0;
+		int l = arraylist.size();
+		for (int k = 0; k < l; ++k) {
+			char[] achar = arraylist.get(k).getData();
 
-		for (ExtendedBlockStorage extendedblockstorage1 : (ArrayList<ExtendedBlockStorage>) arraylist) {
-			char[] achar = extendedblockstorage1.getData();
-
-			for (char c0 : achar) {
+			for (int m = 0; m < achar.length; ++m) {
+				char c0 = achar[m];
 				s21packetchunkdata$extracted.data[j++] = (byte) (c0 & 255);
 				s21packetchunkdata$extracted.data[j++] = (byte) (c0 >> 8 & 255);
 			}
 		}
 
-		for (ExtendedBlockStorage extendedblockstorage2 : (ArrayList<ExtendedBlockStorage>) arraylist) {
-			j = func_179757_a(extendedblockstorage2.getBlocklightArray().getData(), s21packetchunkdata$extracted.data,
-					j);
+		for (int k = 0; k < l; ++k) {
+			j = func_179757_a(arraylist.get(k).getBlocklightArray().getData(), s21packetchunkdata$extracted.data, j);
 		}
 
 		if (parFlag2) {
-			for (ExtendedBlockStorage extendedblockstorage3 : (ArrayList<ExtendedBlockStorage>) arraylist) {
-				j = func_179757_a(extendedblockstorage3.getSkylightArray().getData(), s21packetchunkdata$extracted.data,
-						j);
+			for (int k = 0; k < l; ++k) {
+				j = func_179757_a(arraylist.get(k).getSkylightArray().getData(), s21packetchunkdata$extracted.data, j);
 			}
 		}
 
diff --git a/src/main/java/net/minecraft/network/play/server/S22PacketMultiBlockChange.java b/src/main/java/net/minecraft/network/play/server/S22PacketMultiBlockChange.java
index 382ff30..85612f0 100755
--- a/src/main/java/net/minecraft/network/play/server/S22PacketMultiBlockChange.java
+++ b/src/main/java/net/minecraft/network/play/server/S22PacketMultiBlockChange.java
@@ -70,7 +70,8 @@ public class S22PacketMultiBlockChange implements Packet<INetHandlerPlayClient>
 		parPacketBuffer.writeInt(this.chunkPosCoord.chunkZPos);
 		parPacketBuffer.writeVarIntToBuffer(this.changedBlocks.length);
 
-		for (S22PacketMultiBlockChange.BlockUpdateData s22packetmultiblockchange$blockupdatedata : this.changedBlocks) {
+		for (int i = 0; i < this.changedBlocks.length; ++i) {
+			S22PacketMultiBlockChange.BlockUpdateData s22packetmultiblockchange$blockupdatedata = this.changedBlocks[i];
 			parPacketBuffer.writeShort(s22packetmultiblockchange$blockupdatedata.func_180089_b());
 			parPacketBuffer.writeVarIntToBuffer(
 					Block.BLOCK_STATE_IDS.get(s22packetmultiblockchange$blockupdatedata.getBlockState()));
diff --git a/src/main/java/net/minecraft/network/play/server/S27PacketExplosion.java b/src/main/java/net/minecraft/network/play/server/S27PacketExplosion.java
index 8eeed8f..5957af7 100755
--- a/src/main/java/net/minecraft/network/play/server/S27PacketExplosion.java
+++ b/src/main/java/net/minecraft/network/play/server/S27PacketExplosion.java
@@ -98,7 +98,8 @@ public class S27PacketExplosion implements Packet<INetHandlerPlayClient> {
 		int j = (int) this.posY;
 		int k = (int) this.posZ;
 
-		for (BlockPos blockpos : this.affectedBlockPositions) {
+		for (int m = 0, n = this.affectedBlockPositions.size(); m < n; ++m) {
+			BlockPos blockpos = this.affectedBlockPositions.get(m);
 			int l = blockpos.getX() - i;
 			int i1 = blockpos.getY() - j;
 			int j1 = blockpos.getZ() - k;
diff --git a/src/main/java/net/minecraft/network/play/server/S30PacketWindowItems.java b/src/main/java/net/minecraft/network/play/server/S30PacketWindowItems.java
index 1f657a5..a75fe45 100755
--- a/src/main/java/net/minecraft/network/play/server/S30PacketWindowItems.java
+++ b/src/main/java/net/minecraft/network/play/server/S30PacketWindowItems.java
@@ -67,8 +67,8 @@ public class S30PacketWindowItems implements Packet<INetHandlerPlayClient> {
 		parPacketBuffer.writeByte(this.windowId);
 		parPacketBuffer.writeShort(this.itemStacks.length);
 
-		for (ItemStack itemstack : this.itemStacks) {
-			parPacketBuffer.writeItemStackToBuffer(itemstack);
+		for (int i = 0; i < this.itemStacks.length; ++i) {
+			parPacketBuffer.writeItemStackToBuffer(this.itemStacks[i]);
 		}
 
 	}
diff --git a/src/main/java/net/minecraft/network/play/server/S34PacketMaps.java b/src/main/java/net/minecraft/network/play/server/S34PacketMaps.java
index 3a57e73..bbdfb8f 100755
--- a/src/main/java/net/minecraft/network/play/server/S34PacketMaps.java
+++ b/src/main/java/net/minecraft/network/play/server/S34PacketMaps.java
@@ -93,7 +93,8 @@ public class S34PacketMaps implements Packet<INetHandlerPlayClient> {
 		parPacketBuffer.writeByte(this.mapScale);
 		parPacketBuffer.writeVarIntToBuffer(this.mapVisiblePlayersVec4b.length);
 
-		for (Vec4b vec4b : this.mapVisiblePlayersVec4b) {
+		for (int i = 0; i < this.mapVisiblePlayersVec4b.length; ++i) {
+			Vec4b vec4b = this.mapVisiblePlayersVec4b[i];
 			parPacketBuffer.writeByte((vec4b.func_176110_a() & 15) << 4 | vec4b.func_176111_d() & 15);
 			parPacketBuffer.writeByte(vec4b.func_176112_b());
 			parPacketBuffer.writeByte(vec4b.func_176113_c());
diff --git a/src/main/java/net/minecraft/network/play/server/S38PacketPlayerListItem.java b/src/main/java/net/minecraft/network/play/server/S38PacketPlayerListItem.java
index fcd46e2..64767a3 100755
--- a/src/main/java/net/minecraft/network/play/server/S38PacketPlayerListItem.java
+++ b/src/main/java/net/minecraft/network/play/server/S38PacketPlayerListItem.java
@@ -43,7 +43,8 @@ public class S38PacketPlayerListItem implements Packet<INetHandlerPlayClient> {
 	public S38PacketPlayerListItem(S38PacketPlayerListItem.Action actionIn, EntityPlayerMP... players) {
 		this.action = actionIn;
 
-		for (EntityPlayerMP entityplayermp : players) {
+		for (int i = 0; i < players.length; ++i) {
+			EntityPlayerMP entityplayermp = players[i];
 			this.players.add(new S38PacketPlayerListItem.AddPlayerData(entityplayermp.getGameProfile(),
 					entityplayermp.ping, entityplayermp.theItemInWorldManager.getGameType(),
 					entityplayermp.getTabListDisplayName()));
@@ -129,7 +130,8 @@ public class S38PacketPlayerListItem implements Packet<INetHandlerPlayClient> {
 		parPacketBuffer.writeEnumValue(this.action);
 		parPacketBuffer.writeVarIntToBuffer(this.players.size());
 
-		for (S38PacketPlayerListItem.AddPlayerData s38packetplayerlistitem$addplayerdata : this.players) {
+		for (int i = 0, l = this.players.size(); i < l; ++i) {
+			S38PacketPlayerListItem.AddPlayerData s38packetplayerlistitem$addplayerdata = this.players.get(i);
 			switch (this.action) {
 			case ADD_PLAYER:
 				parPacketBuffer.writeUuid(s38packetplayerlistitem$addplayerdata.getProfile().getId());
diff --git a/src/main/java/net/minecraft/network/play/server/S3APacketTabComplete.java b/src/main/java/net/minecraft/network/play/server/S3APacketTabComplete.java
index 1338377..ef4ed22 100755
--- a/src/main/java/net/minecraft/network/play/server/S3APacketTabComplete.java
+++ b/src/main/java/net/minecraft/network/play/server/S3APacketTabComplete.java
@@ -54,8 +54,8 @@ public class S3APacketTabComplete implements Packet<INetHandlerPlayClient> {
 	public void writePacketData(PacketBuffer parPacketBuffer) throws IOException {
 		parPacketBuffer.writeVarIntToBuffer(this.matches.length);
 
-		for (String s : this.matches) {
-			parPacketBuffer.writeString(s);
+		for (int i = 0; i < this.matches.length; ++i) {
+			parPacketBuffer.writeString(this.matches[i]);
 		}
 
 	}
diff --git a/src/main/java/net/minecraft/network/play/server/S45PacketTitle.java b/src/main/java/net/minecraft/network/play/server/S45PacketTitle.java
index fbff78b..aef2749 100755
--- a/src/main/java/net/minecraft/network/play/server/S45PacketTitle.java
+++ b/src/main/java/net/minecraft/network/play/server/S45PacketTitle.java
@@ -119,7 +119,9 @@ public class S45PacketTitle implements Packet<INetHandlerPlayClient> {
 		TITLE, SUBTITLE, TIMES, CLEAR, RESET;
 
 		public static S45PacketTitle.Type byName(String name) {
-			for (S45PacketTitle.Type s45packettitle$type : values()) {
+			S45PacketTitle.Type[] types = values();
+			for (int i = 0; i < types.length; ++i) {
+				S45PacketTitle.Type s45packettitle$type = types[i];
 				if (s45packettitle$type.name().equalsIgnoreCase(name)) {
 					return s45packettitle$type;
 				}
@@ -129,11 +131,11 @@ public class S45PacketTitle implements Packet<INetHandlerPlayClient> {
 		}
 
 		public static String[] getNames() {
-			String[] astring = new String[values().length];
-			int i = 0;
+			S45PacketTitle.Type[] types = values();
+			String[] astring = new String[types.length];
 
-			for (S45PacketTitle.Type s45packettitle$type : values()) {
-				astring[i++] = s45packettitle$type.name().toLowerCase();
+			for (int i = 0; i < types.length; ++i) {
+				astring[i] = types[i].name().toLowerCase();
 			}
 
 			return astring;
diff --git a/src/main/java/net/minecraft/pathfinding/Path.java b/src/main/java/net/minecraft/pathfinding/Path.java
index c828054..9d1c49c 100755
--- a/src/main/java/net/minecraft/pathfinding/Path.java
+++ b/src/main/java/net/minecraft/pathfinding/Path.java
@@ -1,7 +1,5 @@
 package net.minecraft.pathfinding;
 
-import net.minecraft.pathfinding.PathPoint;
-
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
  * 
@@ -23,7 +21,6 @@ import net.minecraft.pathfinding.PathPoint;
  * 
  */
 public class Path {
-
 	/**+
 	 * Contains the points in this path
 	 */
diff --git a/src/main/java/net/minecraft/pathfinding/PathEntity.java b/src/main/java/net/minecraft/pathfinding/PathEntity.java
index da5690e..ea31ba5 100755
--- a/src/main/java/net/minecraft/pathfinding/PathEntity.java
+++ b/src/main/java/net/minecraft/pathfinding/PathEntity.java
@@ -1,7 +1,6 @@
 package net.minecraft.pathfinding;
 
 import net.minecraft.entity.Entity;
-import net.minecraft.pathfinding.PathPoint;
 import net.minecraft.util.Vec3;
 
 /**+
@@ -25,7 +24,6 @@ import net.minecraft.util.Vec3;
  * 
  */
 public class PathEntity {
-
 	private final PathPoint[] points;
 	private int currentPathIndex;
 	private int pathLength;
diff --git a/src/main/java/net/minecraft/pathfinding/PathFinder.java b/src/main/java/net/minecraft/pathfinding/PathFinder.java
index 38f58db..9e81fb8 100755
--- a/src/main/java/net/minecraft/pathfinding/PathFinder.java
+++ b/src/main/java/net/minecraft/pathfinding/PathFinder.java
@@ -1,9 +1,6 @@
 package net.minecraft.pathfinding;
 
 import net.minecraft.entity.Entity;
-import net.minecraft.pathfinding.Path;
-import net.minecraft.pathfinding.PathEntity;
-import net.minecraft.pathfinding.PathPoint;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.pathfinder.NodeProcessor;
@@ -29,7 +26,6 @@ import net.minecraft.world.pathfinder.NodeProcessor;
  * 
  */
 public class PathFinder {
-
 	/**+
 	 * The path being generated
 	 */
diff --git a/src/main/java/net/minecraft/pathfinding/PathNavigate.java b/src/main/java/net/minecraft/pathfinding/PathNavigate.java
index 14fea35..1a63665 100755
--- a/src/main/java/net/minecraft/pathfinding/PathNavigate.java
+++ b/src/main/java/net/minecraft/pathfinding/PathNavigate.java
@@ -5,8 +5,6 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.SharedMonsterAttributes;
 import net.minecraft.entity.ai.attributes.IAttributeInstance;
-import net.minecraft.pathfinding.PathEntity;
-import net.minecraft.pathfinding.PathFinder;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.MathHelper;
@@ -35,7 +33,6 @@ import net.minecraft.world.World;
  * 
  */
 public abstract class PathNavigate {
-
 	protected EntityLiving theEntity;
 	protected World worldObj;
 	protected PathEntity currentPath;
@@ -201,12 +198,13 @@ public abstract class PathNavigate {
 				if (vec32 != null) {
 					AxisAlignedBB axisalignedbb1 = (new AxisAlignedBB(vec32.xCoord, vec32.yCoord, vec32.zCoord,
 							vec32.xCoord, vec32.yCoord, vec32.zCoord)).expand(0.5D, 0.5D, 0.5D);
-					List list = this.worldObj.getCollidingBoundingBoxes(this.theEntity,
+					List<AxisAlignedBB> list = this.worldObj.getCollidingBoundingBoxes(this.theEntity,
 							axisalignedbb1.addCoord(0.0D, -1.0D, 0.0D));
 					double d0 = -1.0D;
 					axisalignedbb1 = axisalignedbb1.offset(0.0D, 1.0D, 0.0D);
 
-					for (AxisAlignedBB axisalignedbb : (List<AxisAlignedBB>) list) {
+					for (int i = 0, l = list.size(); i < l; ++i) {
+						AxisAlignedBB axisalignedbb = list.get(i);
 						d0 = axisalignedbb.calculateYOffset(axisalignedbb1, d0);
 					}
 
diff --git a/src/main/java/net/minecraft/pathfinding/PathNavigateClimber.java b/src/main/java/net/minecraft/pathfinding/PathNavigateClimber.java
index c321a24..8cd3c4b 100755
--- a/src/main/java/net/minecraft/pathfinding/PathNavigateClimber.java
+++ b/src/main/java/net/minecraft/pathfinding/PathNavigateClimber.java
@@ -2,8 +2,6 @@ package net.minecraft.pathfinding;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
-import net.minecraft.pathfinding.PathEntity;
-import net.minecraft.pathfinding.PathNavigateGround;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
@@ -29,7 +27,6 @@ import net.minecraft.world.World;
  * 
  */
 public class PathNavigateClimber extends PathNavigateGround {
-
 	private BlockPos targetPosition;
 
 	public PathNavigateClimber(EntityLiving entityLivingIn, World worldIn) {
diff --git a/src/main/java/net/minecraft/pathfinding/PathNavigateGround.java b/src/main/java/net/minecraft/pathfinding/PathNavigateGround.java
index fb02f96..081e67e 100755
--- a/src/main/java/net/minecraft/pathfinding/PathNavigateGround.java
+++ b/src/main/java/net/minecraft/pathfinding/PathNavigateGround.java
@@ -6,9 +6,6 @@ import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.monster.EntityZombie;
 import net.minecraft.entity.passive.EntityChicken;
 import net.minecraft.init.Blocks;
-import net.minecraft.pathfinding.PathFinder;
-import net.minecraft.pathfinding.PathNavigate;
-import net.minecraft.pathfinding.PathPoint;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.Vec3;
@@ -36,7 +33,6 @@ import net.minecraft.world.pathfinder.WalkNodeProcessor;
  * 
  */
 public class PathNavigateGround extends PathNavigate {
-
 	protected WalkNodeProcessor nodeProcessor;
 	private boolean shouldAvoidSun;
 
diff --git a/src/main/java/net/minecraft/pathfinding/PathNavigateSwimmer.java b/src/main/java/net/minecraft/pathfinding/PathNavigateSwimmer.java
index bc23d54..f96182f 100755
--- a/src/main/java/net/minecraft/pathfinding/PathNavigateSwimmer.java
+++ b/src/main/java/net/minecraft/pathfinding/PathNavigateSwimmer.java
@@ -1,8 +1,6 @@
 package net.minecraft.pathfinding;
 
 import net.minecraft.entity.EntityLiving;
-import net.minecraft.pathfinding.PathFinder;
-import net.minecraft.pathfinding.PathNavigate;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
@@ -29,7 +27,6 @@ import net.minecraft.world.pathfinder.SwimNodeProcessor;
  * 
  */
 public class PathNavigateSwimmer extends PathNavigate {
-
 	public PathNavigateSwimmer(EntityLiving entitylivingIn, World worldIn) {
 		super(entitylivingIn, worldIn);
 	}
diff --git a/src/main/java/net/minecraft/pathfinding/PathPoint.java b/src/main/java/net/minecraft/pathfinding/PathPoint.java
index da0165e..9cf4234 100755
--- a/src/main/java/net/minecraft/pathfinding/PathPoint.java
+++ b/src/main/java/net/minecraft/pathfinding/PathPoint.java
@@ -23,7 +23,6 @@ import net.minecraft.util.MathHelper;
  * 
  */
 public class PathPoint {
-
 	public final int xCoord;
 	public final int yCoord;
 	public final int zCoord;
diff --git a/src/main/java/net/minecraft/potion/PotionHelper.java b/src/main/java/net/minecraft/potion/PotionHelper.java
index b8912ca..a49a36f 100755
--- a/src/main/java/net/minecraft/potion/PotionHelper.java
+++ b/src/main/java/net/minecraft/potion/PotionHelper.java
@@ -346,7 +346,8 @@ public class PotionHelper {
 	public static List<PotionEffect> getPotionEffects(int parInt1, boolean parFlag) {
 		ArrayList arraylist = null;
 
-		for (Potion potion : Potion.potionTypes) {
+		for (int k = 0; k < Potion.potionTypes.length; ++k) {
+			Potion potion = Potion.potionTypes[k];
 			if (potion != null && (!potion.isUsable() || parFlag)) {
 				String s = (String) potionRequirements.get(Integer.valueOf(potion.getId()));
 				if (s != null) {
diff --git a/src/main/java/net/minecraft/scoreboard/IScoreObjectiveCriteria.java b/src/main/java/net/minecraft/scoreboard/IScoreObjectiveCriteria.java
index 9a33f6b..66b3375 100755
--- a/src/main/java/net/minecraft/scoreboard/IScoreObjectiveCriteria.java
+++ b/src/main/java/net/minecraft/scoreboard/IScoreObjectiveCriteria.java
@@ -97,9 +97,9 @@ public interface IScoreObjectiveCriteria {
 		}
 
 		static {
-			for (IScoreObjectiveCriteria.EnumRenderType iscoreobjectivecriteria$enumrendertype : values()) {
-				field_178801_c.put(iscoreobjectivecriteria$enumrendertype.func_178796_a(),
-						iscoreobjectivecriteria$enumrendertype);
+			IScoreObjectiveCriteria.EnumRenderType[] types = values();
+			for (int i = 0; i < types.length; ++i) {
+				field_178801_c.put(types[i].func_178796_a(), types[i]);
 			}
 
 		}
diff --git a/src/main/java/net/minecraft/scoreboard/ScoreHealthCriteria.java b/src/main/java/net/minecraft/scoreboard/ScoreHealthCriteria.java
index 3e42f41..177ff28 100755
--- a/src/main/java/net/minecraft/scoreboard/ScoreHealthCriteria.java
+++ b/src/main/java/net/minecraft/scoreboard/ScoreHealthCriteria.java
@@ -33,7 +33,8 @@ public class ScoreHealthCriteria extends ScoreDummyCriteria {
 	public int func_96635_a(List<EntityPlayer> list) {
 		float f = 0.0F;
 
-		for (EntityPlayer entityplayer : list) {
+		for (int i = 0, l = list.size(); i < l; ++i) {
+			EntityPlayer entityplayer = list.get(i);
 			f += entityplayer.getHealth() + entityplayer.getAbsorptionAmount();
 		}
 
diff --git a/src/main/java/net/minecraft/scoreboard/ServerScoreboard.java b/src/main/java/net/minecraft/scoreboard/ServerScoreboard.java
index 6d55c98..0c3d779 100755
--- a/src/main/java/net/minecraft/scoreboard/ServerScoreboard.java
+++ b/src/main/java/net/minecraft/scoreboard/ServerScoreboard.java
@@ -12,11 +12,6 @@ import net.minecraft.network.play.server.S3BPacketScoreboardObjective;
 import net.minecraft.network.play.server.S3CPacketUpdateScore;
 import net.minecraft.network.play.server.S3DPacketDisplayScoreboard;
 import net.minecraft.network.play.server.S3EPacketTeams;
-import net.minecraft.scoreboard.Score;
-import net.minecraft.scoreboard.ScoreObjective;
-import net.minecraft.scoreboard.ScorePlayerTeam;
-import net.minecraft.scoreboard.Scoreboard;
-import net.minecraft.scoreboard.ScoreboardSaveData;
 import net.minecraft.server.MinecraftServer;
 
 /**+
@@ -209,11 +204,13 @@ public class ServerScoreboard extends Scoreboard {
 	}
 
 	public void func_96549_e(ScoreObjective parScoreObjective) {
-		List list = this.func_96550_d(parScoreObjective);
+		List<Packet> list = this.func_96550_d(parScoreObjective);
 
-		for (EntityPlayerMP entityplayermp : this.scoreboardMCServer.getConfigurationManager().func_181057_v()) {
-			for (Packet packet : (List<Packet>) list) {
-				entityplayermp.playerNetServerHandler.sendPacket(packet);
+		List<EntityPlayerMP> players = this.scoreboardMCServer.getConfigurationManager().func_181057_v();
+		for (int i = 0, l = players.size(); i < l; ++i) {
+			EntityPlayerMP entityplayermp = players.get(i);
+			for (int j = 0, m = list.size(); j < m; ++j) {
+				entityplayermp.playerNetServerHandler.sendPacket(list.get(j));
 			}
 		}
 
@@ -234,11 +231,13 @@ public class ServerScoreboard extends Scoreboard {
 	}
 
 	public void getPlayerIterator(ScoreObjective parScoreObjective) {
-		List list = this.func_96548_f(parScoreObjective);
+		List<Packet> list = this.func_96548_f(parScoreObjective);
 
-		for (EntityPlayerMP entityplayermp : this.scoreboardMCServer.getConfigurationManager().func_181057_v()) {
-			for (Packet packet : (List<Packet>) list) {
-				entityplayermp.playerNetServerHandler.sendPacket(packet);
+		List<EntityPlayerMP> players = this.scoreboardMCServer.getConfigurationManager().func_181057_v();
+		for (int i = 0, l = players.size(); i < l; ++i) {
+			EntityPlayerMP entityplayermp = players.get(i);
+			for (int j = 0, m = list.size(); j < m; ++j) {
+				entityplayermp.playerNetServerHandler.sendPacket(list.get(j));
 			}
 		}
 
diff --git a/src/main/java/net/minecraft/scoreboard/Team.java b/src/main/java/net/minecraft/scoreboard/Team.java
index e23b7e0..13a6775 100755
--- a/src/main/java/net/minecraft/scoreboard/Team.java
+++ b/src/main/java/net/minecraft/scoreboard/Team.java
@@ -69,8 +69,9 @@ public abstract class Team {
 		}
 
 		static {
-			for (Team.EnumVisible team$enumvisible : values()) {
-				field_178828_g.put(team$enumvisible.field_178830_e, team$enumvisible);
+			Team.EnumVisible[] types = values();
+			for (int i = 0; i < types.length; ++i) {
+				field_178828_g.put(types[i].field_178830_e, types[i]);
 			}
 
 		}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index e49f440..cc2ea94 100755
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -4,11 +4,7 @@ import com.google.common.collect.Lists;
 import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
 
 import java.io.IOException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
@@ -26,7 +22,6 @@ import net.minecraft.command.ServerCommandManager;
 import net.minecraft.crash.CrashReport;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.network.play.server.S03PacketTimeUpdate;
 import net.minecraft.profiler.Profiler;
 import net.minecraft.server.management.ServerConfigurationManager;
@@ -36,7 +31,6 @@ import net.minecraft.util.IChatComponent;
 import net.minecraft.util.IProgressUpdate;
 import net.minecraft.util.IThreadListener;
 import net.minecraft.util.ITickable;
-import net.minecraft.util.MathHelper;
 import net.minecraft.util.ReportedException;
 import net.minecraft.util.Util;
 import net.minecraft.util.Vec3;
@@ -47,13 +41,10 @@ import net.minecraft.world.WorldManager;
 import net.minecraft.world.WorldServer;
 import net.minecraft.world.WorldServerMulti;
 import net.minecraft.world.WorldSettings;
-import net.minecraft.world.WorldType;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.demo.DemoWorldServer;
-import net.minecraft.world.storage.ISaveFormat;
 import net.minecraft.world.storage.ISaveHandler;
 import net.minecraft.world.storage.WorldInfo;
-import org.apache.commons.lang3.Validate;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
@@ -78,7 +69,6 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
  * 
  */
 public abstract class MinecraftServer implements Runnable, ICommandSender, IThreadListener {
-
 	private static final Logger logger = LogManager.getLogger();
 	private static MinecraftServer mcServer;
 	/**+
@@ -305,7 +295,8 @@ public abstract class MinecraftServer implements Runnable, ICommandSender, IThre
 	 */
 	public void saveAllWorlds(boolean dontLog) {
 		if (!this.worldIsBeingDeleted) {
-			for (WorldServer worldserver : this.worldServers) {
+			for (int i = 0; i < this.worldServers.length; ++i) {
+				WorldServer worldserver = this.worldServers[i];
 				if (worldserver != null) {
 					if (!dontLog) {
 						logger.info("Saving chunks for level \'" + worldserver.getWorldInfo().getWorldName() + "\'/"
@@ -659,9 +650,10 @@ public abstract class MinecraftServer implements Runnable, ICommandSender, IThre
 		if (input.startsWith("/")) {
 			input = input.substring(1);
 			boolean flag = !input.contains(" ");
-			List list = this.commandManager.getTabCompletionOptions(sender, input, pos);
+			List<String> list = this.commandManager.getTabCompletionOptions(sender, input, pos);
 			if (list != null) {
-				for (String s2 : (List<String>) list) {
+				for (int i = 0, l = list.size(); i < l; ++i) {
+					String s2 = list.get(i);
 					if (flag) {
 						arraylist.add("/" + s2);
 					} else {
@@ -674,8 +666,9 @@ public abstract class MinecraftServer implements Runnable, ICommandSender, IThre
 		} else {
 			String[] astring = input.split(" ", -1);
 			String s = astring[astring.length - 1];
-
-			for (String s1 : this.serverConfigManager.getAllUsernames()) {
+			String[] unames = this.serverConfigManager.getAllUsernames();
+			for (int i = 0; i < unames.length; ++i) {
+				String s1 = unames[i];
 				if (CommandBase.doesStringStartWith(s, s1)) {
 					arraylist.add(s1);
 				}
@@ -989,7 +982,8 @@ public abstract class MinecraftServer implements Runnable, ICommandSender, IThre
 	}
 
 	public Entity getEntityFromUuid(EaglercraftUUID uuid) {
-		for (WorldServer worldserver : this.worldServers) {
+		for (int i = 0; i < this.worldServers.length; ++i) {
+			WorldServer worldserver = this.worldServers[i];
 			if (worldserver != null) {
 				Entity entity = worldserver.getEntityFromUuid(uuid);
 				if (entity != null) {
diff --git a/src/main/java/net/minecraft/server/management/ItemInWorldManager.java b/src/main/java/net/minecraft/server/management/ItemInWorldManager.java
index 8286cf8..8a4060d 100755
--- a/src/main/java/net/minecraft/server/management/ItemInWorldManager.java
+++ b/src/main/java/net/minecraft/server/management/ItemInWorldManager.java
@@ -41,7 +41,6 @@ import net.minecraft.world.WorldSettings;
  * 
  */
 public class ItemInWorldManager {
-
 	public World theWorld;
 	public EntityPlayerMP thisPlayerMP;
 	private WorldSettings.GameType gameType = WorldSettings.GameType.NOT_SET;
diff --git a/src/main/java/net/minecraft/server/management/PlayerManager.java b/src/main/java/net/minecraft/server/management/PlayerManager.java
index 1e5dcf9..447cee7 100755
--- a/src/main/java/net/minecraft/server/management/PlayerManager.java
+++ b/src/main/java/net/minecraft/server/management/PlayerManager.java
@@ -40,7 +40,6 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
  * 
  */
 public class PlayerManager {
-
 	private static final Logger pmLogger = LogManager.getLogger();
 	private final WorldServer theWorldServer;
 	/**+
@@ -291,7 +290,9 @@ public class PlayerManager {
 		if (radius != this.playerViewRadius) {
 			int i = radius - this.playerViewRadius;
 
-			for (EntityPlayerMP entityplayermp : Lists.newArrayList(this.players)) {
+			List<EntityPlayerMP> playerz = Lists.newArrayList(this.players);
+			for (int m = 0, n = playerz.size(); m < n; ++m) {
+				EntityPlayerMP entityplayermp = playerz.get(m);
 				int j = (int) entityplayermp.posX >> 4;
 				int k = (int) entityplayermp.posZ >> 4;
 				if (i > 0) {
diff --git a/src/main/java/net/minecraft/server/management/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/management/ServerConfigurationManager.java
index 912f8d2..c12c89d 100755
--- a/src/main/java/net/minecraft/server/management/ServerConfigurationManager.java
+++ b/src/main/java/net/minecraft/server/management/ServerConfigurationManager.java
@@ -44,8 +44,6 @@ import net.minecraft.scoreboard.ScorePlayerTeam;
 import net.minecraft.scoreboard.ServerScoreboard;
 import net.minecraft.scoreboard.Team;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.management.ItemInWorldManager;
-import net.minecraft.server.management.PlayerManager;
 import net.minecraft.stats.StatList;
 import net.minecraft.stats.StatisticsFile;
 import net.minecraft.util.BlockPos;
@@ -87,7 +85,6 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
  * 
  */
 public abstract class ServerConfigurationManager {
-
 	private static final Logger logger = LogManager.getLogger();
 	private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd \'at\' HH:mm:ss z");
 	private final MinecraftServer mcServer;
@@ -181,7 +178,8 @@ public abstract class ServerConfigurationManager {
 		}
 
 		if (EagRuntime.getConfiguration().allowUpdateSvc()) {
-			for (EntityPlayerMP playerItr : playerEntityList) {
+			for (int i = 0, l = playerEntityList.size(); i < l; ++i) {
+				EntityPlayerMP playerItr = playerEntityList.get(i);
 				if (playerItr != playerIn && playerItr.updateCertificate != null) {
 					nethandlerplayserver
 							.sendPacket(new S3FPacketCustomPayload("EAG|UpdateCert-1.8",
@@ -203,8 +201,9 @@ public abstract class ServerConfigurationManager {
 		for (int i = 0; i < 19; ++i) {
 			ScoreObjective scoreobjective = scoreboardIn.getObjectiveInDisplaySlot(i);
 			if (scoreobjective != null && !hashset.contains(scoreobjective)) {
-				for (Packet packet : scoreboardIn.func_96550_d(scoreobjective)) {
-					playerIn.playerNetServerHandler.sendPacket(packet);
+				List<Packet> lst = scoreboardIn.func_96550_d(scoreobjective);
+				for (int j = 0, l = lst.size(); j < l; ++j) {
+					playerIn.playerNetServerHandler.sendPacket(lst.get(j));
 				}
 
 				hashset.add(scoreobjective);
@@ -365,7 +364,8 @@ public abstract class ServerConfigurationManager {
 	}
 
 	private boolean doesPlayerAlreadyExist(GameProfile gameprofile) {
-		for (EntityPlayerMP player : this.playerEntityList) {
+		for (int i = 0, l = playerEntityList.size(); i < l; ++i) {
+			EntityPlayerMP player = playerEntityList.get(i);
 			if (player.getName().equalsIgnoreCase(gameprofile.getName())
 					|| player.getUniqueID().equals(gameprofile.getId())) {
 				return true;
@@ -379,9 +379,9 @@ public abstract class ServerConfigurationManager {
 	 */
 	public EntityPlayerMP createPlayerForUser(GameProfile profile) {
 		EaglercraftUUID uuid = EntityPlayer.getUUID(profile);
-		ArrayList arraylist = Lists.newArrayList();
+		ArrayList<EntityPlayerMP> arraylist = Lists.newArrayList();
 
-		for (int i = 0; i < this.playerEntityList.size(); ++i) {
+		for (int i = 0, l = this.playerEntityList.size(); i < l; ++i) {
 			EntityPlayerMP entityplayermp = (EntityPlayerMP) this.playerEntityList.get(i);
 			if (entityplayermp.getUniqueID().equals(uuid)
 					|| entityplayermp.getName().equalsIgnoreCase(profile.getName())) {
@@ -394,8 +394,8 @@ public abstract class ServerConfigurationManager {
 			arraylist.add(entityplayermp2);
 		}
 
-		for (EntityPlayerMP entityplayermp1 : (ArrayList<EntityPlayerMP>) arraylist) {
-			entityplayermp1.playerNetServerHandler.kickPlayerFromServer("You logged in from another location");
+		for (int i = 0, l = arraylist.size(); i < l; ++i) {
+			arraylist.get(i).playerNetServerHandler.kickPlayerFromServer("You logged in from another location");
 		}
 
 		Object object;
@@ -613,7 +613,7 @@ public abstract class ServerConfigurationManager {
 		if (team == null) {
 			this.sendChatMsg(message);
 		} else {
-			for (int i = 0; i < this.playerEntityList.size(); ++i) {
+			for (int i = 0, l = this.playerEntityList.size(); i < l; ++i) {
 				EntityPlayerMP entityplayermp = (EntityPlayerMP) this.playerEntityList.get(i);
 				if (entityplayermp.getTeam() != team) {
 					entityplayermp.addChatMessage(message);
@@ -648,7 +648,7 @@ public abstract class ServerConfigurationManager {
 	public String[] getAllUsernames() {
 		String[] astring = new String[this.playerEntityList.size()];
 
-		for (int i = 0; i < this.playerEntityList.size(); ++i) {
+		for (int i = 0; i < astring.length; ++i) {
 			astring[i] = ((EntityPlayerMP) this.playerEntityList.get(i)).getName();
 		}
 
@@ -658,7 +658,7 @@ public abstract class ServerConfigurationManager {
 	public GameProfile[] getAllProfiles() {
 		GameProfile[] agameprofile = new GameProfile[this.playerEntityList.size()];
 
-		for (int i = 0; i < this.playerEntityList.size(); ++i) {
+		for (int i = 0; i < agameprofile.length; ++i) {
 			agameprofile[i] = ((EntityPlayerMP) this.playerEntityList.get(i)).getGameProfile();
 		}
 
@@ -701,7 +701,7 @@ public abstract class ServerConfigurationManager {
 	 */
 	public void sendToAllNearExcept(EntityPlayer x, double y, double z, double radius, double dimension, int parInt1,
 			Packet parPacket) {
-		for (int i = 0; i < this.playerEntityList.size(); ++i) {
+		for (int i = 0, l = this.playerEntityList.size(); i < l; ++i) {
 			EntityPlayerMP entityplayermp = (EntityPlayerMP) this.playerEntityList.get(i);
 			if (entityplayermp != x && entityplayermp.dimension == parInt1) {
 				double d0 = y - entityplayermp.posX;
@@ -719,7 +719,7 @@ public abstract class ServerConfigurationManager {
 	 * Saves all of the players' current states.
 	 */
 	public void saveAllPlayerData() {
-		for (int i = 0; i < this.playerEntityList.size(); ++i) {
+		for (int i = 0, l = this.playerEntityList.size(); i < l; ++i) {
 			this.writePlayerData((EntityPlayerMP) this.playerEntityList.get(i));
 		}
 
@@ -782,7 +782,8 @@ public abstract class ServerConfigurationManager {
 	public List<EntityPlayerMP> getPlayersMatchingAddress(String address) {
 		ArrayList arraylist = Lists.newArrayList();
 
-		for (EntityPlayerMP entityplayermp : this.playerEntityList) {
+		for (int i = 0, l = playerEntityList.size(); i < l; ++i) {
+			EntityPlayerMP entityplayermp = playerEntityList.get(i);
 			if (entityplayermp.getPlayerIP().equals(address)) {
 				arraylist.add(entityplayermp);
 			}
@@ -841,7 +842,7 @@ public abstract class ServerConfigurationManager {
 	 * Kicks everyone with "Server closed" as reason.
 	 */
 	public void removeAllPlayers() {
-		for (int i = 0; i < this.playerEntityList.size(); ++i) {
+		for (int i = 0, l = this.playerEntityList.size(); i < l; ++i) {
 			((EntityPlayerMP) this.playerEntityList.get(i)).playerNetServerHandler
 					.kickPlayerFromServer("Server closed");
 		}
@@ -879,7 +880,9 @@ public abstract class ServerConfigurationManager {
 	public void setViewDistance(int distance) {
 		this.viewDistance = distance;
 		if (this.mcServer.worldServers != null) {
-			for (WorldServer worldserver : this.mcServer.worldServers) {
+			WorldServer[] srv = this.mcServer.worldServers;
+			for (int i = 0; i < srv.length; ++i) {
+				WorldServer worldserver = srv[i];
 				if (worldserver != null) {
 					worldserver.getPlayerManager().setPlayerViewRadius(distance);
 				}
diff --git a/src/main/java/net/minecraft/server/network/NetHandlerLoginServer.java b/src/main/java/net/minecraft/server/network/NetHandlerLoginServer.java
index bcb4c68..722048e 100755
--- a/src/main/java/net/minecraft/server/network/NetHandlerLoginServer.java
+++ b/src/main/java/net/minecraft/server/network/NetHandlerLoginServer.java
@@ -43,7 +43,6 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
  * 
  */
 public class NetHandlerLoginServer implements INetHandlerLoginServer, ITickable {
-
 	private static final Logger logger = LogManager.getLogger();
 	private static final EaglercraftRandom RANDOM = new EaglercraftRandom();
 	private final byte[] verifyToken = new byte[4];
diff --git a/src/main/java/net/minecraft/stats/StatisticsFile.java b/src/main/java/net/minecraft/stats/StatisticsFile.java
index 7b9f696..5a97708 100755
--- a/src/main/java/net/minecraft/stats/StatisticsFile.java
+++ b/src/main/java/net/minecraft/stats/StatisticsFile.java
@@ -2,7 +2,6 @@ package net.minecraft.stats;
 
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -13,11 +12,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.network.play.server.S37PacketStatistics;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.stats.Achievement;
-import net.minecraft.stats.AchievementList;
-import net.minecraft.stats.StatBase;
-import net.minecraft.stats.StatFileWriter;
-import net.minecraft.stats.StatList;
 import net.minecraft.util.ChatComponentTranslation;
 import net.minecraft.util.IJsonSerializable;
 import net.minecraft.util.TupleIntJsonSerializable;
@@ -49,7 +43,6 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
  * 
  */
 public class StatisticsFile extends StatFileWriter {
-
 	private static final Logger logger = LogManager.getLogger();
 	private final MinecraftServer mcServer;
 	private final VFile2 statsFile;
@@ -211,7 +204,8 @@ public class StatisticsFile extends StatFileWriter {
 	public void sendAchievements(EntityPlayerMP player) {
 		HashMap hashmap = Maps.newHashMap();
 
-		for (Achievement achievement : AchievementList.achievementList) {
+		for (int i = 0, l = AchievementList.achievementList.size(); i < l; ++i) {
+			Achievement achievement = AchievementList.achievementList.get(i);
 			if (this.hasAchievementUnlocked(achievement)) {
 				hashmap.put(achievement, Integer.valueOf(this.readStat(achievement)));
 				this.field_150888_e.remove(achievement);
diff --git a/src/main/java/net/minecraft/tileentity/MobSpawnerBaseLogic.java b/src/main/java/net/minecraft/tileentity/MobSpawnerBaseLogic.java
index ff684b5..90d88e3 100755
--- a/src/main/java/net/minecraft/tileentity/MobSpawnerBaseLogic.java
+++ b/src/main/java/net/minecraft/tileentity/MobSpawnerBaseLogic.java
@@ -301,9 +301,10 @@ public abstract class MobSpawnerBaseLogic {
 
 			if (this.getRandomEntity() != null || this.minecartToSpawn.size() > 0) {
 				NBTTagList nbttaglist = new NBTTagList();
-				if (this.minecartToSpawn.size() > 0) {
-					for (MobSpawnerBaseLogic.WeightedRandomMinecart mobspawnerbaselogic$weightedrandomminecart : this.minecartToSpawn) {
-						nbttaglist.appendTag(mobspawnerbaselogic$weightedrandomminecart.toNBT());
+				int l = this.minecartToSpawn.size();
+				if (l > 0) {
+					for (int i = 0; i < l; ++i) {
+						nbttaglist.appendTag(this.minecartToSpawn.get(i).toNBT());
 					}
 				} else {
 					nbttaglist.appendTag(this.getRandomEntity().toNBT());
diff --git a/src/main/java/net/minecraft/tileentity/TileEntityBanner.java b/src/main/java/net/minecraft/tileentity/TileEntityBanner.java
index d7310e4..8f676e1 100755
--- a/src/main/java/net/minecraft/tileentity/TileEntityBanner.java
+++ b/src/main/java/net/minecraft/tileentity/TileEntityBanner.java
@@ -241,6 +241,8 @@ public class TileEntityBanner extends TileEntity {
 				() -> new ItemStack(Blocks.red_flower, 1, BlockFlower.EnumFlowerType.OXEYE_DAISY.getMeta())),
 		MOJANG("mojang", "moj", () -> new ItemStack(Items.golden_apple, 1, 1));
 
+		public static final EnumBannerPattern[] _VALUES = values();
+
 		private String patternName;
 		private String patternID;
 		private String[] craftingLayers;
@@ -293,7 +295,9 @@ public class TileEntityBanner extends TileEntity {
 		}
 
 		public static TileEntityBanner.EnumBannerPattern getPatternByID(String id) {
-			for (TileEntityBanner.EnumBannerPattern tileentitybanner$enumbannerpattern : values()) {
+			TileEntityBanner.EnumBannerPattern[] arr = _VALUES;
+			for (int i = 0; i < arr.length; ++i) {
+				TileEntityBanner.EnumBannerPattern tileentitybanner$enumbannerpattern = arr[i];
 				if (tileentitybanner$enumbannerpattern.patternID.equals(id)) {
 					return tileentitybanner$enumbannerpattern;
 				}
diff --git a/src/main/java/net/minecraft/tileentity/TileEntityBeacon.java b/src/main/java/net/minecraft/tileentity/TileEntityBeacon.java
index 59fb8b4..2b2d5c5 100755
--- a/src/main/java/net/minecraft/tileentity/TileEntityBeacon.java
+++ b/src/main/java/net/minecraft/tileentity/TileEntityBeacon.java
@@ -100,13 +100,13 @@ public class TileEntityBeacon extends TileEntityLockable implements ITickable, I
 							(double) this.worldObj.getHeight(), 0.0D);
 			List<EntityPlayer> list = this.worldObj.getEntitiesWithinAABB(EntityPlayer.class, axisalignedbb);
 
-			for (EntityPlayer entityplayer : list) {
-				entityplayer.addPotionEffect(new PotionEffect(this.primaryEffect, 180, b0, true, true));
+			for (int m = 0, l = list.size(); m < l; ++m) {
+				list.get(m).addPotionEffect(new PotionEffect(this.primaryEffect, 180, b0, true, true));
 			}
 
 			if (this.levels >= 4 && this.primaryEffect != this.secondaryEffect && this.secondaryEffect > 0) {
-				for (EntityPlayer entityplayer1 : list) {
-					entityplayer1.addPotionEffect(new PotionEffect(this.secondaryEffect, 180, 0, true, true));
+				for (int m = 0, l = list.size(); m < l; ++m) {
+					list.get(m).addPotionEffect(new PotionEffect(this.secondaryEffect, 180, 0, true, true));
 				}
 			}
 		}
@@ -194,10 +194,11 @@ public class TileEntityBeacon extends TileEntityLockable implements ITickable, I
 		}
 
 		if (!this.worldObj.isRemote && this.levels == 4 && i < this.levels) {
-			for (EntityPlayer entityplayer : this.worldObj.getEntitiesWithinAABB(EntityPlayer.class,
+			List<EntityPlayer> lst = this.worldObj.getEntitiesWithinAABB(EntityPlayer.class,
 					(new AxisAlignedBB((double) j, (double) k, (double) l, (double) j, (double) (k - 4), (double) l))
-							.expand(10.0D, 5.0D, 10.0D))) {
-				entityplayer.triggerAchievement(AchievementList.fullBeacon);
+							.expand(10.0D, 5.0D, 10.0D));
+			for (int m = 0, n = lst.size(); m < n; ++m) {
+				lst.get(m).triggerAchievement(AchievementList.fullBeacon);
 			}
 		}
 
diff --git a/src/main/java/net/minecraft/tileentity/TileEntityChest.java b/src/main/java/net/minecraft/tileentity/TileEntityChest.java
index 1e367c9..60ddfcf 100755
--- a/src/main/java/net/minecraft/tileentity/TileEntityChest.java
+++ b/src/main/java/net/minecraft/tileentity/TileEntityChest.java
@@ -1,5 +1,7 @@
 package net.minecraft.tileentity;
 
+import java.util.List;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockChest;
 import net.minecraft.entity.player.EntityPlayer;
@@ -282,10 +284,12 @@ public class TileEntityChest extends TileEntityLockable implements ITickable, II
 			this.numPlayersUsing = 0;
 			float f = 5.0F;
 
-			for (EntityPlayer entityplayer : this.worldObj.getEntitiesWithinAABB(EntityPlayer.class,
+			List<EntityPlayer> players = this.worldObj.getEntitiesWithinAABB(EntityPlayer.class,
 					new AxisAlignedBB((double) ((float) i - f), (double) ((float) j - f), (double) ((float) k - f),
 							(double) ((float) (i + 1) + f), (double) ((float) (j + 1) + f),
-							(double) ((float) (k + 1) + f)))) {
+							(double) ((float) (k + 1) + f)));
+			for (int m = 0, l = players.size(); m < l; ++m) {
+				EntityPlayer entityplayer = players.get(m);
 				if (entityplayer.openContainer instanceof ContainerChest) {
 					IInventory iinventory = ((ContainerChest) entityplayer.openContainer).getLowerChestInventory();
 					if (iinventory == this || iinventory instanceof InventoryLargeChest
diff --git a/src/main/java/net/minecraft/tileentity/TileEntityHopper.java b/src/main/java/net/minecraft/tileentity/TileEntityHopper.java
index 65e4ba4..d98136e 100755
--- a/src/main/java/net/minecraft/tileentity/TileEntityHopper.java
+++ b/src/main/java/net/minecraft/tileentity/TileEntityHopper.java
@@ -251,8 +251,8 @@ public class TileEntityHopper extends TileEntityLockable implements IHopper, ITi
 	}
 
 	private boolean isEmpty() {
-		for (ItemStack itemstack : this.inventory) {
-			if (itemstack != null) {
+		for (int i = 0; i < this.inventory.length; ++i) {
+			if (this.inventory[i] != null) {
 				return false;
 			}
 		}
@@ -261,7 +261,8 @@ public class TileEntityHopper extends TileEntityLockable implements IHopper, ITi
 	}
 
 	private boolean isFull() {
-		for (ItemStack itemstack : this.inventory) {
+		for (int i = 0; i < this.inventory.length; ++i) {
+			ItemStack itemstack = this.inventory[i];
 			if (itemstack == null || itemstack.stackSize != itemstack.getMaxStackSize()) {
 				return false;
 			}
@@ -379,9 +380,10 @@ public class TileEntityHopper extends TileEntityLockable implements IHopper, ITi
 				}
 			}
 		} else {
-			for (EntityItem entityitem : func_181556_a(parIHopper.getWorld(), parIHopper.getXPos(),
-					parIHopper.getYPos() + 1.0D, parIHopper.getZPos())) {
-				if (putDropInInventoryAllSlots(parIHopper, entityitem)) {
+			List<EntityItem> list = func_181556_a(parIHopper.getWorld(), parIHopper.getXPos(),
+					parIHopper.getYPos() + 1.0D, parIHopper.getZPos());
+			for (int i = 0, l = list.size(); i < l; ++i) {
+				if (putDropInInventoryAllSlots(parIHopper, list.get(i))) {
 					return true;
 				}
 			}
diff --git a/src/main/java/net/minecraft/tileentity/TileEntityPiston.java b/src/main/java/net/minecraft/tileentity/TileEntityPiston.java
index 54a4a86..bd64be8 100755
--- a/src/main/java/net/minecraft/tileentity/TileEntityPiston.java
+++ b/src/main/java/net/minecraft/tileentity/TileEntityPiston.java
@@ -118,7 +118,8 @@ public class TileEntityPiston extends TileEntity implements ITickable {
 			if (!list.isEmpty()) {
 				this.field_174933_k.addAll(list);
 
-				for (Entity entity : this.field_174933_k) {
+				for (int i = 0, l = this.field_174933_k.size(); i < l; ++i) {
+					Entity entity = this.field_174933_k.get(i);
 					if (this.pistonState.getBlock() == Blocks.slime_block && this.extending) {
 						switch (this.pistonFacing.getAxis()) {
 						case X:
diff --git a/src/main/java/net/minecraft/util/ChatAllowedCharacters.java b/src/main/java/net/minecraft/util/ChatAllowedCharacters.java
index 1a8356a..f1d282b 100755
--- a/src/main/java/net/minecraft/util/ChatAllowedCharacters.java
+++ b/src/main/java/net/minecraft/util/ChatAllowedCharacters.java
@@ -39,7 +39,9 @@ public class ChatAllowedCharacters {
 	public static String filterAllowedCharacters(String input) {
 		StringBuilder stringbuilder = new StringBuilder();
 
-		for (char c0 : input.toCharArray()) {
+		char[] chars = input.toCharArray();
+		for (int i = 0; i < chars.length; ++i) {
+			char c0 = chars[i];
 			if (isAllowedCharacter(c0)) {
 				stringbuilder.append(c0);
 			}
diff --git a/src/main/java/net/minecraft/util/ChatComponentProcessor.java b/src/main/java/net/minecraft/util/ChatComponentProcessor.java
index c98c258..232a324 100755
--- a/src/main/java/net/minecraft/util/ChatComponentProcessor.java
+++ b/src/main/java/net/minecraft/util/ChatComponentProcessor.java
@@ -78,8 +78,9 @@ public class ChatComponentProcessor {
 			((IChatComponent) object).setChatStyle(chatstyle.createShallowCopy());
 		}
 
-		for (IChatComponent ichatcomponent : component.getSiblings()) {
-			((IChatComponent) object).appendSibling(processComponent(commandSender, ichatcomponent, entityIn));
+		List<IChatComponent> lst = component.getSiblings();
+		for (int i = 0, l = lst.size(); i < l; ++i) {
+			((IChatComponent) object).appendSibling(processComponent(commandSender, lst.get(i), entityIn));
 		}
 
 		return (IChatComponent) object;
diff --git a/src/main/java/net/minecraft/util/ChatComponentScore.java b/src/main/java/net/minecraft/util/ChatComponentScore.java
index f281a0a..b7dd912 100755
--- a/src/main/java/net/minecraft/util/ChatComponentScore.java
+++ b/src/main/java/net/minecraft/util/ChatComponentScore.java
@@ -5,6 +5,8 @@ import net.minecraft.scoreboard.ScoreObjective;
 import net.minecraft.scoreboard.Scoreboard;
 import net.minecraft.server.MinecraftServer;
 
+import java.util.List;
+
 import net.lax1dude.eaglercraft.v1_8.HString;
 
 /**+
@@ -85,8 +87,9 @@ public class ChatComponentScore extends ChatComponentStyle {
 		chatcomponentscore.setValue(this.value);
 		chatcomponentscore.setChatStyle(this.getChatStyle().createShallowCopy());
 
-		for (IChatComponent ichatcomponent : this.getSiblings()) {
-			chatcomponentscore.appendSibling(ichatcomponent.createCopy());
+		List<IChatComponent> lst = this.getSiblings();
+		for (int i = 0, l = lst.size(); i < l; ++i) {
+			chatcomponentscore.appendSibling(lst.get(i).createCopy());
 		}
 
 		return chatcomponentscore;
diff --git a/src/main/java/net/minecraft/util/ChatComponentSelector.java b/src/main/java/net/minecraft/util/ChatComponentSelector.java
index a5d0112..d665f0c 100755
--- a/src/main/java/net/minecraft/util/ChatComponentSelector.java
+++ b/src/main/java/net/minecraft/util/ChatComponentSelector.java
@@ -1,5 +1,7 @@
 package net.minecraft.util;
 
+import java.util.List;
+
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
  * 
@@ -51,8 +53,9 @@ public class ChatComponentSelector extends ChatComponentStyle {
 		ChatComponentSelector chatcomponentselector = new ChatComponentSelector(this.selector);
 		chatcomponentselector.setChatStyle(this.getChatStyle().createShallowCopy());
 
-		for (IChatComponent ichatcomponent : this.getSiblings()) {
-			chatcomponentselector.appendSibling(ichatcomponent.createCopy());
+		List<IChatComponent> lst = this.getSiblings();
+		for (int i = 0, l = lst.size(); i < l; ++i) {
+			chatcomponentselector.appendSibling(lst.get(i).createCopy());
 		}
 
 		return chatcomponentselector;
diff --git a/src/main/java/net/minecraft/util/ChatComponentStyle.java b/src/main/java/net/minecraft/util/ChatComponentStyle.java
index 85e72d1..43d13e6 100755
--- a/src/main/java/net/minecraft/util/ChatComponentStyle.java
+++ b/src/main/java/net/minecraft/util/ChatComponentStyle.java
@@ -62,8 +62,8 @@ public abstract class ChatComponentStyle implements IChatComponent {
 	public IChatComponent setChatStyle(ChatStyle style) {
 		this.style = style;
 
-		for (IChatComponent ichatcomponent : this.siblings) {
-			ichatcomponent.getChatStyle().setParentStyle(this.getChatStyle());
+		for (int i = 0, l = this.siblings.size(); i < l; ++i) {
+			this.siblings.get(i).getChatStyle().setParentStyle(this.getChatStyle());
 		}
 
 		return this;
@@ -73,8 +73,8 @@ public abstract class ChatComponentStyle implements IChatComponent {
 		if (this.style == null) {
 			this.style = new ChatStyle();
 
-			for (IChatComponent ichatcomponent : this.siblings) {
-				ichatcomponent.getChatStyle().setParentStyle(this.style);
+			for (int i = 0, l = this.siblings.size(); i < l; ++i) {
+				this.siblings.get(i).getChatStyle().setParentStyle(this.style);
 			}
 		}
 
diff --git a/src/main/java/net/minecraft/util/ChatComponentText.java b/src/main/java/net/minecraft/util/ChatComponentText.java
index 69f894f..2fc6115 100755
--- a/src/main/java/net/minecraft/util/ChatComponentText.java
+++ b/src/main/java/net/minecraft/util/ChatComponentText.java
@@ -1,5 +1,7 @@
 package net.minecraft.util;
 
+import java.util.List;
+
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
  * 
@@ -54,8 +56,9 @@ public class ChatComponentText extends ChatComponentStyle {
 		ChatComponentText chatcomponenttext = new ChatComponentText(this.text);
 		chatcomponenttext.setChatStyle(this.getChatStyle().createShallowCopy());
 
-		for (IChatComponent ichatcomponent : this.getSiblings()) {
-			chatcomponenttext.appendSibling(ichatcomponent.createCopy());
+		List<IChatComponent> lst = this.getSiblings();
+		for (int i = 0, l = lst.size(); i < l; ++i) {
+			chatcomponenttext.appendSibling(lst.get(i).createCopy());
 		}
 
 		return chatcomponenttext;
diff --git a/src/main/java/net/minecraft/util/ChatComponentTranslation.java b/src/main/java/net/minecraft/util/ChatComponentTranslation.java
index 7703d99..aeda3e0 100755
--- a/src/main/java/net/minecraft/util/ChatComponentTranslation.java
+++ b/src/main/java/net/minecraft/util/ChatComponentTranslation.java
@@ -44,7 +44,8 @@ public class ChatComponentTranslation extends ChatComponentStyle {
 		this.key = translationKey;
 		this.formatArgs = args;
 
-		for (Object object : args) {
+		for (int i = 0; i < args.length; ++i) {
+			Object object = args[i];
 			if (object instanceof IChatComponent) {
 				((IChatComponent) object).getChatStyle().setParentStyle(this.getChatStyle());
 			}
@@ -154,15 +155,16 @@ public class ChatComponentTranslation extends ChatComponentStyle {
 	public IChatComponent setChatStyle(ChatStyle chatstyle) {
 		super.setChatStyle(chatstyle);
 
-		for (Object object : this.formatArgs) {
+		for (int i = 0; i < this.formatArgs.length; ++i) {
+			Object object = this.formatArgs[i];
 			if (object instanceof IChatComponent) {
 				((IChatComponent) object).getChatStyle().setParentStyle(this.getChatStyle());
 			}
 		}
 
 		if (this.lastTranslationUpdateTimeInMilliseconds > -1L) {
-			for (IChatComponent ichatcomponent : this.children) {
-				ichatcomponent.getChatStyle().setParentStyle(chatstyle);
+			for (int i = 0, l = this.children.size(); i < l; ++i) {
+				this.children.get(i).getChatStyle().setParentStyle(chatstyle);
 			}
 		}
 
@@ -183,8 +185,8 @@ public class ChatComponentTranslation extends ChatComponentStyle {
 		this.ensureInitialized();
 		StringBuilder stringbuilder = new StringBuilder();
 
-		for (IChatComponent ichatcomponent : this.children) {
-			stringbuilder.append(ichatcomponent.getUnformattedTextForChat());
+		for (int i = 0, l = this.children.size(); i < l; ++i) {
+			stringbuilder.append(this.children.get(i).getUnformattedTextForChat());
 		}
 
 		return stringbuilder.toString();
@@ -208,8 +210,9 @@ public class ChatComponentTranslation extends ChatComponentStyle {
 		ChatComponentTranslation chatcomponenttranslation = new ChatComponentTranslation(this.key, aobject);
 		chatcomponenttranslation.setChatStyle(this.getChatStyle().createShallowCopy());
 
-		for (IChatComponent ichatcomponent : this.getSiblings()) {
-			chatcomponenttranslation.appendSibling(ichatcomponent.createCopy());
+		List<IChatComponent> lst = this.getSiblings();
+		for (int i = 0, l = lst.size(); i < l; ++i) {
+			chatcomponenttranslation.appendSibling(lst.get(i).createCopy());
 		}
 
 		return chatcomponenttranslation;
diff --git a/src/main/java/net/minecraft/util/ClassInheritanceMultiMap.java b/src/main/java/net/minecraft/util/ClassInheritanceMultiMap.java
index eb87879..70c1a2f 100755
--- a/src/main/java/net/minecraft/util/ClassInheritanceMultiMap.java
+++ b/src/main/java/net/minecraft/util/ClassInheritanceMultiMap.java
@@ -52,9 +52,10 @@ public class ClassInheritanceMultiMap<T> extends AbstractSet<T> {
 	protected void createLookup(Class<?> clazz) {
 		field_181158_a.add(clazz);
 
-		for (Object object : this.field_181745_e) {
+		for (int i = 0, l = this.field_181745_e.size(); i < l; ++i) {
+			T object = this.field_181745_e.get(i);
 			if (clazz.isAssignableFrom(object.getClass())) {
-				this.func_181743_a((T) object, clazz);
+				this.func_181743_a(object, clazz);
 			}
 		}
 
diff --git a/src/main/java/net/minecraft/util/CombatTracker.java b/src/main/java/net/minecraft/util/CombatTracker.java
index f6ebb9f..dab0c76 100755
--- a/src/main/java/net/minecraft/util/CombatTracker.java
+++ b/src/main/java/net/minecraft/util/CombatTracker.java
@@ -144,7 +144,8 @@ public class CombatTracker {
 		float f = 0.0F;
 		float f1 = 0.0F;
 
-		for (CombatEntry combatentry : this.combatEntries) {
+		for (int i = 0, l = this.combatEntries.size(); i < l; ++i) {
+			CombatEntry combatentry = this.combatEntries.get(i);
 			if (combatentry.getDamageSrc().getEntity() instanceof EntityPlayer
 					&& (entityplayer == null || combatentry.func_94563_c() > f1)) {
 				f1 = combatentry.func_94563_c();
diff --git a/src/main/java/net/minecraft/util/EnumChatFormatting.java b/src/main/java/net/minecraft/util/EnumChatFormatting.java
index 44608b6..a35843e 100755
--- a/src/main/java/net/minecraft/util/EnumChatFormatting.java
+++ b/src/main/java/net/minecraft/util/EnumChatFormatting.java
@@ -37,6 +37,8 @@ public enum EnumChatFormatting {
 	STRIKETHROUGH("STRIKETHROUGH", 'm', true), UNDERLINE("UNDERLINE", 'n', true), ITALIC("ITALIC", 'o', true),
 	RESET("RESET", 'r', -1);
 
+	public static final EnumChatFormatting[] _VALUES = values();
+
 	private static final Map<String, EnumChatFormatting> nameMapping = Maps.newHashMap();
 	/**+
 	 * Matches formatting codes that indicate that the client should
@@ -124,7 +126,9 @@ public enum EnumChatFormatting {
 		if (parInt1 < 0) {
 			return RESET;
 		} else {
-			for (EnumChatFormatting enumchatformatting : values()) {
+			EnumChatFormatting[] types = _VALUES;
+			for (int i = 0; i < types.length; ++i) {
+				EnumChatFormatting enumchatformatting = types[i];
 				if (enumchatformatting.getColorIndex() == parInt1) {
 					return enumchatformatting;
 				}
@@ -143,7 +147,9 @@ public enum EnumChatFormatting {
 	public static Collection<String> getValidValues(boolean parFlag, boolean parFlag2) {
 		ArrayList arraylist = Lists.newArrayList();
 
-		for (EnumChatFormatting enumchatformatting : values()) {
+		EnumChatFormatting[] types = _VALUES;
+		for (int i = 0; i < types.length; ++i) {
+			EnumChatFormatting enumchatformatting = types[i];
 			if ((!enumchatformatting.isColor() || parFlag) && (!enumchatformatting.isFancyStyling() || parFlag2)) {
 				arraylist.add(enumchatformatting.getFriendlyName());
 			}
@@ -153,8 +159,9 @@ public enum EnumChatFormatting {
 	}
 
 	static {
-		for (EnumChatFormatting enumchatformatting : values()) {
-			nameMapping.put(func_175745_c(enumchatformatting.name), enumchatformatting);
+		EnumChatFormatting[] types = _VALUES;
+		for (int i = 0; i < types.length; ++i) {
+			nameMapping.put(func_175745_c(types[i].name), types[i]);
 		}
 
 	}
diff --git a/src/main/java/net/minecraft/util/EnumFacing.java b/src/main/java/net/minecraft/util/EnumFacing.java
index 5380ed9..7d19e70 100755
--- a/src/main/java/net/minecraft/util/EnumFacing.java
+++ b/src/main/java/net/minecraft/util/EnumFacing.java
@@ -36,6 +36,8 @@ public enum EnumFacing implements IStringSerializable {
 	WEST(4, 5, 1, "west", EnumFacing.AxisDirection.NEGATIVE, EnumFacing.Axis.X, new Vec3i(-1, 0, 0)),
 	EAST(5, 4, 3, "east", EnumFacing.AxisDirection.POSITIVE, EnumFacing.Axis.X, new Vec3i(1, 0, 0));
 
+	public static final EnumFacing[] _VALUES = values();
+
 	private final int index;
 	private final int opposite;
 	private final int horizontalIndex;
@@ -276,14 +278,16 @@ public enum EnumFacing implements IStringSerializable {
 	 * Choose a random Facing using the given Random
 	 */
 	public static EnumFacing random(EaglercraftRandom rand) {
-		return values()[rand.nextInt(values().length)];
+		return _VALUES[rand.nextInt(_VALUES.length)];
 	}
 
 	public static EnumFacing getFacingFromVector(float parFloat1, float parFloat2, float parFloat3) {
 		EnumFacing enumfacing = NORTH;
 		float f = Float.MIN_VALUE;
 
-		for (EnumFacing enumfacing1 : values()) {
+		EnumFacing[] facings = _VALUES;
+		for (int i = 0; i < facings.length; ++i) {
+			EnumFacing enumfacing1 = facings[i];
 			float f1 = parFloat1 * (float) enumfacing1.directionVec.getX()
 					+ parFloat2 * (float) enumfacing1.directionVec.getY()
 					+ parFloat3 * (float) enumfacing1.directionVec.getZ();
@@ -305,7 +309,9 @@ public enum EnumFacing implements IStringSerializable {
 	}
 
 	public static EnumFacing func_181076_a(EnumFacing.AxisDirection parAxisDirection, EnumFacing.Axis parAxis) {
-		for (EnumFacing enumfacing : values()) {
+		EnumFacing[] facings = EnumFacing._VALUES;
+		for (int i = 0; i < facings.length; ++i) {
+			EnumFacing enumfacing = facings[i];
 			if (enumfacing.getAxisDirection() == parAxisDirection && enumfacing.getAxis() == parAxis) {
 				return enumfacing;
 			}
@@ -323,7 +329,10 @@ public enum EnumFacing implements IStringSerializable {
 	}
 
 	static {
-		for (EnumFacing enumfacing : values()) {
+		Plane.bootstrap();
+		EnumFacing[] facings = EnumFacing._VALUES;
+		for (int i = 0; i < facings.length; ++i) {
+			EnumFacing enumfacing = facings[i];
 			VALUES[enumfacing.index] = enumfacing;
 			if (enumfacing.getAxis().isHorizontal()) {
 				HORIZONTALS[enumfacing.horizontalIndex] = enumfacing;
@@ -385,8 +394,9 @@ public enum EnumFacing implements IStringSerializable {
 		}
 
 		static {
-			for (EnumFacing.Axis enumfacing$axis : values()) {
-				NAME_LOOKUP.put(enumfacing$axis.getName2().toLowerCase(), enumfacing$axis);
+			EnumFacing.Axis[] axis = values();
+			for (int i = 0; i < axis.length; ++i) {
+				NAME_LOOKUP.put(axis[i].getName2().toLowerCase(), axis[i]);
 			}
 
 		}
@@ -395,6 +405,8 @@ public enum EnumFacing implements IStringSerializable {
 	public static enum AxisDirection {
 		POSITIVE(1, "Towards positive"), NEGATIVE(-1, "Towards negative");
 
+		public static final AxisDirection[] _VALUES = values();
+
 		private final int offset;
 		private final String description;
 
@@ -413,17 +425,16 @@ public enum EnumFacing implements IStringSerializable {
 	}
 
 	public static enum Plane implements Predicate<EnumFacing>, Iterable<EnumFacing> {
-		HORIZONTAL, VERTICAL;
+		HORIZONTAL(new EnumFacing[4]), VERTICAL(new EnumFacing[2]);
+
+		public final EnumFacing[] facingsArray;
+
+		private Plane(EnumFacing[] facingsArray) {
+			this.facingsArray = facingsArray;
+		}
 
 		public EnumFacing[] facings() {
-			switch (this) {
-			case HORIZONTAL:
-				return new EnumFacing[] { EnumFacing.NORTH, EnumFacing.EAST, EnumFacing.SOUTH, EnumFacing.WEST };
-			case VERTICAL:
-				return new EnumFacing[] { EnumFacing.UP, EnumFacing.DOWN };
-			default:
-				throw new Error("Someone\'s been tampering with the universe!");
-			}
+			return facingsArray;
 		}
 
 		/**+
@@ -439,7 +450,16 @@ public enum EnumFacing implements IStringSerializable {
 		}
 
 		public Iterator<EnumFacing> iterator() {
-			return Iterators.forArray(this.facings());
+			return Iterators.forArray(facingsArray);
+		}
+
+		private static void bootstrap() {
+			HORIZONTAL.facingsArray[0] = EnumFacing.NORTH;
+			HORIZONTAL.facingsArray[1] = EnumFacing.EAST;
+			HORIZONTAL.facingsArray[2] = EnumFacing.SOUTH;
+			HORIZONTAL.facingsArray[3] = EnumFacing.WEST;
+			VERTICAL.facingsArray[0] = EnumFacing.UP;
+			VERTICAL.facingsArray[1] = EnumFacing.DOWN;
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/util/EnumParticleTypes.java b/src/main/java/net/minecraft/util/EnumParticleTypes.java
index c87039c..b834b40 100755
--- a/src/main/java/net/minecraft/util/EnumParticleTypes.java
+++ b/src/main/java/net/minecraft/util/EnumParticleTypes.java
@@ -43,6 +43,8 @@ public enum EnumParticleTypes {
 	BLOCK_CRACK("blockcrack_", 37, false, 1), BLOCK_DUST("blockdust_", 38, false, 1), WATER_DROP("droplet", 39, false),
 	ITEM_TAKE("take", 40, false), MOB_APPEARANCE("mobappearance", 41, true);
 
+	public static final EnumParticleTypes[] _VALUES = values();
+
 	private final String particleName;
 	private final int particleID;
 	private final boolean shouldIgnoreRange;
@@ -95,7 +97,9 @@ public enum EnumParticleTypes {
 	static {
 		ArrayList arraylist = Lists.newArrayList();
 
-		for (EnumParticleTypes enumparticletypes : values()) {
+		EnumParticleTypes[] types = values();
+		for (int i = 0; i < types.length; ++i) {
+			EnumParticleTypes enumparticletypes = types[i];
 			PARTICLES.put(Integer.valueOf(enumparticletypes.getParticleID()), enumparticletypes);
 			if (!enumparticletypes.getParticleName().endsWith("_")) {
 				arraylist.add(enumparticletypes.getParticleName());
diff --git a/src/main/java/net/minecraft/util/EnumWorldBlockLayer.java b/src/main/java/net/minecraft/util/EnumWorldBlockLayer.java
index b408262..306ae0e 100755
--- a/src/main/java/net/minecraft/util/EnumWorldBlockLayer.java
+++ b/src/main/java/net/minecraft/util/EnumWorldBlockLayer.java
@@ -24,6 +24,8 @@ public enum EnumWorldBlockLayer {
 	SOLID("Solid"), CUTOUT_MIPPED("Mipped Cutout"), CUTOUT("Cutout"), TRANSLUCENT("Translucent"),
 	REALISTIC_WATER("EaglerShaderWater"), GLASS_HIGHLIGHTS("EaglerShaderGlassHighlights");
 
+	public static final EnumWorldBlockLayer[] _VALUES = values();
+
 	private final String layerName;
 
 	private EnumWorldBlockLayer(String layerNameIn) {
diff --git a/src/main/java/net/minecraft/util/IChatComponent.java b/src/main/java/net/minecraft/util/IChatComponent.java
index 9f8b811..51c952b 100755
--- a/src/main/java/net/minecraft/util/IChatComponent.java
+++ b/src/main/java/net/minecraft/util/IChatComponent.java
@@ -84,8 +84,8 @@ public interface IChatComponent extends Iterable<IChatComponent> {
 					JSONArray jsonarray1 = (JSONArray) parJsonElement;
 					IChatComponent ichatcomponent = null;
 
-					for (Object jsonelement : jsonarray1) {
-						IChatComponent ichatcomponent1 = this.deserialize(jsonelement);
+					for (int i = 0, l = jsonarray1.length(); i < l; ++i) {
+						IChatComponent ichatcomponent1 = this.deserialize(jsonarray1.get(i));
 						if (ichatcomponent == null) {
 							ichatcomponent = ichatcomponent1;
 						} else {
@@ -179,8 +179,9 @@ public interface IChatComponent extends Iterable<IChatComponent> {
 				if (!ichatcomponent.getSiblings().isEmpty()) {
 					JSONArray jsonarray = new JSONArray();
 
-					for (IChatComponent ichatcomponent1 : ichatcomponent.getSiblings()) {
-						jsonarray.put(this.serialize(ichatcomponent1));
+					List<IChatComponent> lst = ichatcomponent.getSiblings();
+					for (int i = 0, l = lst.size(); i < l; ++i) {
+						jsonarray.put(this.serialize(lst.get(i)));
 					}
 
 					jsonobject.put("extra", jsonarray);
@@ -195,7 +196,9 @@ public interface IChatComponent extends Iterable<IChatComponent> {
 							&& chatcomponenttranslation.getFormatArgs().length > 0) {
 						JSONArray jsonarray1 = new JSONArray();
 
-						for (Object object : chatcomponenttranslation.getFormatArgs()) {
+						Object[] arr = chatcomponenttranslation.getFormatArgs();
+						for (int i = 0; i < arr.length; ++i) {
+							Object object = arr[i];
 							if (object instanceof IChatComponent) {
 								jsonarray1.put(this.serialize((IChatComponent) object));
 							} else {
diff --git a/src/main/java/net/minecraft/util/MathHelper.java b/src/main/java/net/minecraft/util/MathHelper.java
index 2ca4a99..a3ec1c3 100755
--- a/src/main/java/net/minecraft/util/MathHelper.java
+++ b/src/main/java/net/minecraft/util/MathHelper.java
@@ -181,8 +181,8 @@ public class MathHelper {
 	public static double average(long[] values) {
 		long i = 0L;
 
-		for (long j : values) {
-			i += j;
+		for (int j = 0; j < values.length; ++j) {
+			i += values[j];
 		}
 
 		return (double) i / (double) values.length;
diff --git a/src/main/java/net/minecraft/util/StatCollector.java b/src/main/java/net/minecraft/util/StatCollector.java
index d90e078..80066a3 100755
--- a/src/main/java/net/minecraft/util/StatCollector.java
+++ b/src/main/java/net/minecraft/util/StatCollector.java
@@ -1,7 +1,5 @@
 package net.minecraft.util;
 
-import net.minecraft.util.StringTranslate;
-
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
  * 
diff --git a/src/main/java/net/minecraft/util/StringTranslate.java b/src/main/java/net/minecraft/util/StringTranslate.java
index 41589f7..ab9ad9e 100755
--- a/src/main/java/net/minecraft/util/StringTranslate.java
+++ b/src/main/java/net/minecraft/util/StringTranslate.java
@@ -74,7 +74,8 @@ public class StringTranslate {
 
 	public static void initServer(List<String> strs) {
 		instance.languageList.clear();
-		for (String s : strs) {
+		for (int i = 0, l = strs.size(); i < l; ++i) {
+			String s = strs.get(i);
 			if (!s.isEmpty() && s.charAt(0) != 35) {
 				String[] astring = (String[]) Iterables.toArray(equalSignSplitter.split(s), String.class);
 				if (astring != null && astring.length == 2) {
diff --git a/src/main/java/net/minecraft/village/Village.java b/src/main/java/net/minecraft/village/Village.java
index 492ae6b..f1b2a99 100755
--- a/src/main/java/net/minecraft/village/Village.java
+++ b/src/main/java/net/minecraft/village/Village.java
@@ -1,11 +1,9 @@
 package net.minecraft.village;
 
 import com.google.common.collect.Lists;
-import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
 import java.util.Iterator;
 import java.util.List;
 import java.util.TreeMap;
-import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockDoor;
 import net.minecraft.block.material.Material;
@@ -15,12 +13,10 @@ import net.minecraft.entity.passive.EntityVillager;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.Vec3;
-import net.minecraft.village.VillageDoorInfo;
 import net.minecraft.world.World;
 
 /**+
@@ -44,7 +40,6 @@ import net.minecraft.world.World;
  * 
  */
 public class Village {
-
 	private World worldObj;
 	/**+
 	 * list of VillageDoorInfo objects
@@ -202,7 +197,8 @@ public class Village {
 		VillageDoorInfo villagedoorinfo = null;
 		int i = Integer.MAX_VALUE;
 
-		for (VillageDoorInfo villagedoorinfo1 : this.villageDoorInfoList) {
+		for (int m = 0, n = this.villageDoorInfoList.size(); m < n; ++m) {
+			VillageDoorInfo villagedoorinfo1 = this.villageDoorInfoList.get(m);
 			int j = villagedoorinfo1.getDistanceToDoorBlockSq(pos);
 			if (j < i) {
 				villagedoorinfo = villagedoorinfo1;
@@ -221,7 +217,8 @@ public class Village {
 		VillageDoorInfo villagedoorinfo = null;
 		int i = Integer.MAX_VALUE;
 
-		for (VillageDoorInfo villagedoorinfo1 : this.villageDoorInfoList) {
+		for (int m = 0, n = this.villageDoorInfoList.size(); m < n; ++m) {
+			VillageDoorInfo villagedoorinfo1 = this.villageDoorInfoList.get(m);
 			int j = villagedoorinfo1.getDistanceToDoorBlockSq(pos);
 			if (j > 256) {
 				j = j * 1000;
@@ -245,7 +242,8 @@ public class Village {
 		if (this.center.distanceSq(doorBlock) > (double) (this.villageRadius * this.villageRadius)) {
 			return null;
 		} else {
-			for (VillageDoorInfo villagedoorinfo : this.villageDoorInfoList) {
+			for (int m = 0, n = this.villageDoorInfoList.size(); m < n; ++m) {
+				VillageDoorInfo villagedoorinfo = this.villageDoorInfoList.get(m);
 				if (villagedoorinfo.getDoorBlockPos().getX() == doorBlock.getX()
 						&& villagedoorinfo.getDoorBlockPos().getZ() == doorBlock.getZ()
 						&& Math.abs(villagedoorinfo.getDoorBlockPos().getY() - doorBlock.getY()) <= 1) {
@@ -273,7 +271,8 @@ public class Village {
 	}
 
 	public void addOrRenewAgressor(EntityLivingBase entitylivingbaseIn) {
-		for (Village.VillageAggressor village$villageaggressor : this.villageAgressors) {
+		for (int i = 0, l = this.villageAgressors.size(); i < l; ++i) {
+			Village.VillageAggressor village$villageaggressor = this.villageAgressors.get(i);
 			if (village$villageaggressor.agressor == entitylivingbaseIn) {
 				village$villageaggressor.agressionTime = this.tickCounter;
 				return;
@@ -374,8 +373,8 @@ public class Village {
 					this.centerHelper.getZ() / i);
 			int j = 0;
 
-			for (VillageDoorInfo villagedoorinfo : this.villageDoorInfoList) {
-				j = Math.max(villagedoorinfo.getDistanceToDoorBlockSq(this.center), j);
+			for (int m = 0, n = this.villageDoorInfoList.size(); m < n; ++m) {
+				j = Math.max(this.villageDoorInfoList.get(m).getDistanceToDoorBlockSq(this.center), j);
 			}
 
 			this.villageRadius = Math.max(32, (int) Math.sqrt((double) j) + 1);
@@ -464,7 +463,8 @@ public class Village {
 		parNBTTagCompound.setInteger("ACZ", this.centerHelper.getZ());
 		NBTTagList nbttaglist = new NBTTagList();
 
-		for (VillageDoorInfo villagedoorinfo : this.villageDoorInfoList) {
+		for (int m = 0, n = this.villageDoorInfoList.size(); m < n; ++m) {
+			VillageDoorInfo villagedoorinfo = this.villageDoorInfoList.get(m);
 			NBTTagCompound nbttagcompound = new NBTTagCompound();
 			nbttagcompound.setInteger("X", villagedoorinfo.getDoorBlockPos().getX());
 			nbttagcompound.setInteger("Y", villagedoorinfo.getDoorBlockPos().getY());
diff --git a/src/main/java/net/minecraft/village/VillageCollection.java b/src/main/java/net/minecraft/village/VillageCollection.java
index 6c7f101..a1a4ffd 100755
--- a/src/main/java/net/minecraft/village/VillageCollection.java
+++ b/src/main/java/net/minecraft/village/VillageCollection.java
@@ -10,8 +10,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
-import net.minecraft.village.Village;
-import net.minecraft.village.VillageDoorInfo;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldProvider;
 import net.minecraft.world.WorldSavedData;
@@ -37,7 +35,6 @@ import net.minecraft.world.WorldSavedData;
  * 
  */
 public class VillageCollection extends WorldSavedData {
-
 	private World worldObj;
 	/**+
 	 * This is a black hole. You can add data to this list through a
@@ -62,8 +59,8 @@ public class VillageCollection extends WorldSavedData {
 	public void setWorldsForAll(World worldIn) {
 		this.worldObj = worldIn;
 
-		for (Village village : this.villageList) {
-			village.setWorld(worldIn);
+		for (int i = 0, l = this.villageList.size(); i < l; ++i) {
+			this.villageList.get(i).setWorld(worldIn);
 		}
 
 	}
@@ -83,8 +80,8 @@ public class VillageCollection extends WorldSavedData {
 	public void tick() {
 		++this.tickCounter;
 
-		for (Village village : this.villageList) {
-			village.tick(this.tickCounter);
+		for (int i = 0, l = this.villageList.size(); i < l; ++i) {
+			this.villageList.get(i).tick(this.tickCounter);
 		}
 
 		this.removeAnnihilatedVillages();
@@ -120,7 +117,8 @@ public class VillageCollection extends WorldSavedData {
 		Village village = null;
 		double d0 = 3.4028234663852886E38D;
 
-		for (Village village1 : this.villageList) {
+		for (int i = 0, l = this.villageList.size(); i < l; ++i) {
+			Village village1 = this.villageList.get(i);
 			double d1 = village1.getCenter().distanceSq(doorBlock);
 			if (d1 < d0) {
 				float f = (float) (radius + village1.getVillageRadius());
@@ -184,7 +182,8 @@ public class VillageCollection extends WorldSavedData {
 	 * the newDoor list, otherwise returns null
 	 */
 	private VillageDoorInfo checkDoorExistence(BlockPos doorBlock) {
-		for (VillageDoorInfo villagedoorinfo : this.newDoors) {
+		for (int i = 0, l = this.newDoors.size(); i < l; ++i) {
+			VillageDoorInfo villagedoorinfo = this.newDoors.get(i);
 			if (villagedoorinfo.getDoorBlockPos().getX() == doorBlock.getX()
 					&& villagedoorinfo.getDoorBlockPos().getZ() == doorBlock.getZ()
 					&& Math.abs(villagedoorinfo.getDoorBlockPos().getY() - doorBlock.getY()) <= 1) {
@@ -192,8 +191,8 @@ public class VillageCollection extends WorldSavedData {
 			}
 		}
 
-		for (Village village : this.villageList) {
-			VillageDoorInfo villagedoorinfo1 = village.getExistedDoor(doorBlock);
+		for (int i = 0, l = this.villageList.size(); i < l; ++i) {
+			VillageDoorInfo villagedoorinfo1 = this.villageList.get(i).getExistedDoor(doorBlock);
 			if (villagedoorinfo1 != null) {
 				return villagedoorinfo1;
 			}
@@ -233,8 +232,8 @@ public class VillageCollection extends WorldSavedData {
 	}
 
 	private boolean positionInList(BlockPos pos) {
-		for (BlockPos blockpos : this.villagerPositionsList) {
-			if (blockpos.equals(pos)) {
+		for (int i = 0, l = this.villagerPositionsList.size(); i < l; ++i) {
+			if (this.villagerPositionsList.get(i).equals(pos)) {
 				return true;
 			}
 		}
@@ -271,9 +270,9 @@ public class VillageCollection extends WorldSavedData {
 		nbttagcompound.setInteger("Tick", this.tickCounter);
 		NBTTagList nbttaglist = new NBTTagList();
 
-		for (Village village : this.villageList) {
+		for (int i = 0, l = this.villageList.size(); i < l; ++i) {
 			NBTTagCompound nbttagcompound1 = new NBTTagCompound();
-			village.writeVillageDataToNBT(nbttagcompound1);
+			this.villageList.get(i).writeVillageDataToNBT(nbttagcompound1);
 			nbttaglist.appendTag(nbttagcompound1);
 		}
 
diff --git a/src/main/java/net/minecraft/village/VillageDoorInfo.java b/src/main/java/net/minecraft/village/VillageDoorInfo.java
index b7e7084..227e559 100755
--- a/src/main/java/net/minecraft/village/VillageDoorInfo.java
+++ b/src/main/java/net/minecraft/village/VillageDoorInfo.java
@@ -24,7 +24,6 @@ import net.minecraft.util.EnumFacing;
  * 
  */
 public class VillageDoorInfo {
-
 	private final BlockPos doorBlockPos;
 	private final BlockPos insideBlock;
 	private final EnumFacing insideDirection;
diff --git a/src/main/java/net/minecraft/village/VillageSiege.java b/src/main/java/net/minecraft/village/VillageSiege.java
index c88c3a2..2e2f24b 100755
--- a/src/main/java/net/minecraft/village/VillageSiege.java
+++ b/src/main/java/net/minecraft/village/VillageSiege.java
@@ -11,7 +11,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.Vec3;
-import net.minecraft.village.Village;
 import net.minecraft.world.SpawnerAnimals;
 import net.minecraft.world.World;
 
@@ -36,7 +35,6 @@ import net.minecraft.world.World;
  * 
  */
 public class VillageSiege {
-
 	private World worldObj;
 	private boolean field_75535_b;
 	private int field_75536_c = -1;
@@ -122,7 +120,9 @@ public class VillageSiege {
 						this.field_75539_i = blockpos.getZ() + (int) ((double) (MathHelper.sin(f1) * f) * 0.9D);
 						flag = false;
 
-						for (Village village : this.worldObj.getVillageCollection().getVillageList()) {
+						List<Village> lst = this.worldObj.getVillageCollection().getVillageList();
+						for (int j = 0, l = lst.size(); j < l; ++j) {
+							Village village = lst.get(i);
 							if (village != this.theVillage && village.func_179866_a(
 									new BlockPos(this.field_75532_g, this.field_75538_h, this.field_75539_i))) {
 								flag = true;
diff --git a/src/main/java/net/minecraft/world/ChunkCache.java b/src/main/java/net/minecraft/world/ChunkCache.java
index 9944de4..5a63d5c 100755
--- a/src/main/java/net/minecraft/world/ChunkCache.java
+++ b/src/main/java/net/minecraft/world/ChunkCache.java
@@ -111,8 +111,10 @@ public class ChunkCache implements IBlockAccess {
 			if (this.getBlockState(parBlockPos).getBlock().getUseNeighborBrightness()) {
 				int l = 0;
 
-				for (EnumFacing enumfacing : EnumFacing.values()) {
-					int k = this.getLightFor(pos, parBlockPos.offset(enumfacing));
+				EnumFacing[] facings = EnumFacing._VALUES;
+				BlockPos tmp = new BlockPos(0, 0, 0);
+				for (int i = 0; i < facings.length; ++i) {
+					int k = this.getLightFor(pos, parBlockPos.offsetEvenFaster(facings[i], tmp));
 					if (k > l) {
 						l = k;
 					}
diff --git a/src/main/java/net/minecraft/world/EnumDifficulty.java b/src/main/java/net/minecraft/world/EnumDifficulty.java
index 8c88efd..b228976 100755
--- a/src/main/java/net/minecraft/world/EnumDifficulty.java
+++ b/src/main/java/net/minecraft/world/EnumDifficulty.java
@@ -24,7 +24,7 @@ public enum EnumDifficulty {
 	PEACEFUL(0, "options.difficulty.peaceful"), EASY(1, "options.difficulty.easy"),
 	NORMAL(2, "options.difficulty.normal"), HARD(3, "options.difficulty.hard");
 
-	private static final EnumDifficulty[] difficultyEnums = new EnumDifficulty[values().length];
+	private static final EnumDifficulty[] difficultyEnums = new EnumDifficulty[4];
 	private final int difficultyId;
 	private final String difficultyResourceKey;
 
@@ -46,8 +46,9 @@ public enum EnumDifficulty {
 	}
 
 	static {
-		for (EnumDifficulty enumdifficulty : values()) {
-			difficultyEnums[enumdifficulty.difficultyId] = enumdifficulty;
+		EnumDifficulty[] types = values();
+		for (int i = 0; i < types.length; ++i) {
+			difficultyEnums[types[i].difficultyId] = types[i];
 		}
 
 	}
diff --git a/src/main/java/net/minecraft/world/Explosion.java b/src/main/java/net/minecraft/world/Explosion.java
index 0fbe6ed..9322a86 100755
--- a/src/main/java/net/minecraft/world/Explosion.java
+++ b/src/main/java/net/minecraft/world/Explosion.java
@@ -21,6 +21,7 @@ import net.minecraft.init.Blocks;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumParticleTypes;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.Vec3;
@@ -191,7 +192,8 @@ public class Explosion {
 		}
 
 		if (this.isSmoking) {
-			for (BlockPos blockpos : this.affectedBlockPositions) {
+			for (int i = 0, l = this.affectedBlockPositions.size(); i < l; ++i) {
+				BlockPos blockpos = this.affectedBlockPositions.get(i);
 				Block block = this.worldObj.getBlockState(blockpos).getBlock();
 				if (spawnParticles) {
 					double d0 = (double) ((float) blockpos.getX() + this.worldObj.rand.nextFloat());
@@ -228,9 +230,11 @@ public class Explosion {
 		}
 
 		if (this.isFlaming) {
-			for (BlockPos blockpos1 : this.affectedBlockPositions) {
-				if (this.worldObj.getBlockState(blockpos1).getBlock().getMaterial() == Material.air
-						&& this.worldObj.getBlockState(blockpos1.down()).getBlock().isFullBlock()
+			BlockPos tmp = new BlockPos(0, 0, 0);
+			for (int i = 0, l = this.affectedBlockPositions.size(); i < l; ++i) {
+				BlockPos blockpos1 = this.affectedBlockPositions.get(i);
+				if (this.worldObj.getBlockState(blockpos1).getBlock().getMaterial() == Material.air && this.worldObj
+						.getBlockState(blockpos1.offsetEvenFaster(EnumFacing.DOWN, tmp)).getBlock().isFullBlock()
 						&& this.explosionRNG.nextInt(3) == 0) {
 					this.worldObj.setBlockState(blockpos1, Blocks.fire.getDefaultState());
 				}
diff --git a/src/main/java/net/minecraft/world/SpawnerAnimals.java b/src/main/java/net/minecraft/world/SpawnerAnimals.java
index 974d4c8..635e6f1 100755
--- a/src/main/java/net/minecraft/world/SpawnerAnimals.java
+++ b/src/main/java/net/minecraft/world/SpawnerAnimals.java
@@ -18,9 +18,6 @@ import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.WeightedRandom;
-import net.minecraft.world.ChunkCoordIntPair;
-import net.minecraft.world.World;
-import net.minecraft.world.WorldServer;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.chunk.Chunk;
 
@@ -45,7 +42,6 @@ import net.minecraft.world.chunk.Chunk;
  * 
  */
 public final class SpawnerAnimals {
-
 	private static final int MOB_COUNT_DIV = (int) Math.pow(17.0D, 2.0D);
 	/**+
 	 * The 17x17 area around the player where mobs can spawn
@@ -65,7 +61,9 @@ public final class SpawnerAnimals {
 			this.eligibleChunksForSpawning.clear();
 			int i = 0;
 
-			for (EntityPlayer entityplayer : spawnHostileMobs.playerEntities) {
+			List<EntityPlayer> lst = spawnHostileMobs.playerEntities;
+			for (int m = 0, n = lst.size(); m < n; ++m) {
+				EntityPlayer entityplayer = lst.get(m);
 				if (!entityplayer.isSpectator()) {
 					int j = MathHelper.floor_double(entityplayer.posX / 16.0D);
 					int k = MathHelper.floor_double(entityplayer.posZ / 16.0D);
@@ -91,7 +89,9 @@ public final class SpawnerAnimals {
 			int k3 = 0;
 			BlockPos blockpos2 = spawnHostileMobs.getSpawnPoint();
 
-			for (EnumCreatureType enumcreaturetype : EnumCreatureType.values()) {
+			EnumCreatureType[] types = EnumCreatureType._VALUES;
+			for (int m = 0; m < types.length; ++m) {
+				EnumCreatureType enumcreaturetype = types[m];
 				if ((!enumcreaturetype.getPeacefulCreature() || parFlag2)
 						&& (enumcreaturetype.getPeacefulCreature() || spawnPeacefulMobs)
 						&& (!enumcreaturetype.getAnimal() || parFlag3)) {
diff --git a/src/main/java/net/minecraft/world/Teleporter.java b/src/main/java/net/minecraft/world/Teleporter.java
index 365d9df..40285fe 100755
--- a/src/main/java/net/minecraft/world/Teleporter.java
+++ b/src/main/java/net/minecraft/world/Teleporter.java
@@ -13,8 +13,6 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.LongHashMap;
 import net.minecraft.util.MathHelper;
-import net.minecraft.world.ChunkCoordIntPair;
-import net.minecraft.world.WorldServer;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -37,7 +35,6 @@ import net.minecraft.world.WorldServer;
  * 
  */
 public class Teleporter {
-
 	private final WorldServer worldServerInstance;
 	private final EaglercraftRandom random;
 	/**+
diff --git a/src/main/java/net/minecraft/world/World.java b/src/main/java/net/minecraft/world/World.java
index 785d843..a6759ee 100755
--- a/src/main/java/net/minecraft/world/World.java
+++ b/src/main/java/net/minecraft/world/World.java
@@ -2305,7 +2305,9 @@ public abstract class World implements IBlockAccess {
 			} else if (i >= 14) {
 				return i;
 			} else {
-				for (EnumFacing enumfacing : EnumFacing.values()) {
+				EnumFacing[] facings = EnumFacing._VALUES;
+				for (int m = 0; m < facings.length; ++m) {
+					EnumFacing enumfacing = facings[m];
 					BlockPos blockpos = pos.offset(enumfacing);
 					int k = this.getLightFor(lightType, blockpos) - j;
 					if (k > i) {
@@ -2356,7 +2358,9 @@ public abstract class World implements IBlockAccess {
 							if (j3 + k3 + l3 < 17) {
 								BlockPos.MutableBlockPos blockpos$mutableblockpos = new BlockPos.MutableBlockPos();
 
-								for (EnumFacing enumfacing : EnumFacing.values()) {
+								EnumFacing[] facings = EnumFacing._VALUES;
+								for (int m = 0; m < facings.length; ++m) {
+									EnumFacing enumfacing = facings[m];
 									int i4 = i2 + enumfacing.getFrontOffsetX();
 									int j4 = j2 + enumfacing.getFrontOffsetY();
 									int k4 = k2 + enumfacing.getFrontOffsetZ();
@@ -2485,7 +2489,8 @@ public abstract class World implements IBlockAccess {
 	public <T extends Entity> List<T> getEntities(Class<? extends T> entityType, Predicate<? super T> filter) {
 		ArrayList arraylist = Lists.newArrayList();
 
-		for (Entity entity : this.loadedEntityList) {
+		for (int i = 0, l = this.loadedEntityList.size(); i < l; ++i) {
+			Entity entity = this.loadedEntityList.get(i);
 			if (entityType.isAssignableFrom(entity.getClass()) && filter.apply((T) entity)) {
 				arraylist.add(entity);
 			}
@@ -2497,7 +2502,8 @@ public abstract class World implements IBlockAccess {
 	public <T extends Entity> List<T> getPlayers(Class<? extends T> playerType, Predicate<? super T> filter) {
 		ArrayList arraylist = Lists.newArrayList();
 
-		for (Entity entity : this.playerEntities) {
+		for (int i = 0, l = this.playerEntities.size(); i < l; ++i) {
+			Entity entity = this.playerEntities.get(i);
 			if (playerType.isAssignableFrom(entity.getClass()) && filter.apply((T) entity)) {
 				arraylist.add(entity);
 			}
@@ -2578,7 +2584,8 @@ public abstract class World implements IBlockAccess {
 	public int countEntities(Class<?> entityType) {
 		int i = 0;
 
-		for (Entity entity : this.loadedEntityList) {
+		for (int j = 0, l = this.loadedEntityList.size(); j < l; ++j) {
+			Entity entity = this.loadedEntityList.get(j);
 			if ((!(entity instanceof EntityLiving) || !((EntityLiving) entity).isNoDespawnRequired())
 					&& entityType.isAssignableFrom(entity.getClass())) {
 				++i;
@@ -2693,7 +2700,9 @@ public abstract class World implements IBlockAccess {
 	public int isBlockIndirectlyGettingPowered(BlockPos pos) {
 		int i = 0;
 
-		for (EnumFacing enumfacing : EnumFacing.values()) {
+		EnumFacing[] facings = EnumFacing._VALUES;
+		for (int k = 0; k < facings.length; ++k) {
+			EnumFacing enumfacing = facings[k];
 			int j = this.getRedstonePower(pos.offset(enumfacing), enumfacing);
 			if (j >= 15) {
 				return 15;
@@ -3125,7 +3134,9 @@ public abstract class World implements IBlockAccess {
 	}
 
 	public void updateComparatorOutputLevel(BlockPos pos, Block blockIn) {
-		for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) {
+		EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+		for (int i = 0; i < facings.length; ++i) {
+			EnumFacing enumfacing = facings[i];
 			BlockPos blockpos = pos.offset(enumfacing);
 			if (this.isBlockLoaded(blockpos)) {
 				IBlockState iblockstate = this.getBlockState(blockpos);
diff --git a/src/main/java/net/minecraft/world/WorldManager.java b/src/main/java/net/minecraft/world/WorldManager.java
index 6b1ab84..490bb12 100755
--- a/src/main/java/net/minecraft/world/WorldManager.java
+++ b/src/main/java/net/minecraft/world/WorldManager.java
@@ -8,8 +8,6 @@ import net.minecraft.network.play.server.S28PacketEffect;
 import net.minecraft.network.play.server.S29PacketSoundEffect;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.BlockPos;
-import net.minecraft.world.IWorldAccess;
-import net.minecraft.world.WorldServer;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -32,7 +30,6 @@ import net.minecraft.world.WorldServer;
  * 
  */
 public class WorldManager implements IWorldAccess {
-
 	private MinecraftServer mcServer;
 	private WorldServer theWorldServer;
 
diff --git a/src/main/java/net/minecraft/world/WorldServer.java b/src/main/java/net/minecraft/world/WorldServer.java
index 62b52fc..fece50a 100755
--- a/src/main/java/net/minecraft/world/WorldServer.java
+++ b/src/main/java/net/minecraft/world/WorldServer.java
@@ -55,17 +55,6 @@ import net.minecraft.util.WeightedRandom;
 import net.minecraft.util.WeightedRandomChestContent;
 import net.minecraft.village.VillageCollection;
 import net.minecraft.village.VillageSiege;
-import net.minecraft.world.ChunkCoordIntPair;
-import net.minecraft.world.EnumDifficulty;
-import net.minecraft.world.Explosion;
-import net.minecraft.world.MinecraftException;
-import net.minecraft.world.NextTickListEntry;
-import net.minecraft.world.SpawnerAnimals;
-import net.minecraft.world.Teleporter;
-import net.minecraft.world.World;
-import net.minecraft.world.WorldProvider;
-import net.minecraft.world.WorldSettings;
-import net.minecraft.world.WorldType;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.biome.WorldChunkManager;
 import net.minecraft.world.chunk.Chunk;
@@ -102,7 +91,6 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
  * 
  */
 public class WorldServer extends World implements IThreadListener {
-
 	private static final Logger logger = LogManager.getLogger();
 	private final MinecraftServer mcServer;
 	private final EntityTracker theEntityTracker;
@@ -263,7 +251,8 @@ public class WorldServer extends World implements IThreadListener {
 			int i = 0;
 			int j = 0;
 
-			for (EntityPlayer entityplayer : this.playerEntities) {
+			for (int k = 0, l = this.playerEntities.size(); k < l; ++k) {
+				EntityPlayer entityplayer = this.playerEntities.get(k);
 				if (entityplayer.isSpectator()) {
 					++i;
 				} else if (entityplayer.isPlayerSleeping()) {
@@ -279,7 +268,8 @@ public class WorldServer extends World implements IThreadListener {
 	protected void wakeAllPlayers() {
 		this.allPlayersSleeping = false;
 
-		for (EntityPlayer entityplayer : this.playerEntities) {
+		for (int k = 0, l = this.playerEntities.size(); k < l; ++k) {
+			EntityPlayer entityplayer = this.playerEntities.get(k);
 			if (entityplayer.isPlayerSleeping()) {
 				entityplayer.wakeUpPlayer(false, false, true);
 			}
@@ -297,7 +287,8 @@ public class WorldServer extends World implements IThreadListener {
 
 	public boolean areAllPlayersAsleep() {
 		if (this.allPlayersSleeping) {
-			for (EntityPlayer entityplayer : this.playerEntities) {
+			for (int k = 0, l = this.playerEntities.size(); k < l; ++k) {
+				EntityPlayer entityplayer = this.playerEntities.get(k);
 				if (entityplayer.isSpectator() || !entityplayer.isPlayerFullyAsleep()) {
 					return false;
 				}
@@ -390,7 +381,9 @@ public class WorldServer extends World implements IThreadListener {
 				this.theProfiler.endStartSection("tickBlocks");
 				int l2 = this.getGameRules().getInt("randomTickSpeed");
 				if (l2 > 0) {
-					for (ExtendedBlockStorage extendedblockstorage : chunk.getBlockStorageArray()) {
+					ExtendedBlockStorage[] vigg = chunk.getBlockStorageArray();
+					for (int m = 0; m < vigg.length; ++m) {
+						ExtendedBlockStorage extendedblockstorage = vigg[m];
 						if (extendedblockstorage != null && extendedblockstorage.getNeedsRandomTick()) {
 							for (int j1 = 0; j1 < l2; ++j1) {
 								this.updateLCG = this.updateLCG * 3 + 1013904223;
@@ -808,7 +801,9 @@ public class WorldServer extends World implements IThreadListener {
 
 			this.chunkProvider.saveChunks(progressCallback, parIProgressUpdate);
 
-			for (Chunk chunk : Lists.newArrayList(this.theChunkProviderServer.func_152380_a())) {
+			List<Chunk> lst = Lists.newArrayList(this.theChunkProviderServer.func_152380_a());
+			for (int i = 0, l = lst.size(); i < l; ++i) {
+				Chunk chunk = lst.get(i);
 				if (chunk != null && !this.thePlayerManager.hasPlayerInstance(chunk.xPosition, chunk.zPosition)) {
 					this.theChunkProviderServer.dropChunk(chunk.xPosition, chunk.zPosition);
 				}
@@ -907,7 +902,9 @@ public class WorldServer extends World implements IThreadListener {
 			explosion.func_180342_d();
 		}
 
-		for (EntityPlayer entityplayer : this.playerEntities) {
+		List<EntityPlayer> lst = this.playerEntities;
+		for (int i = 0, l = lst.size(); i < l; ++i) {
+			EntityPlayer entityplayer = lst.get(i);
 			if (entityplayer.getDistanceSq(d0, d1, d2) < 4096.0D) {
 				((EntityPlayerMP) entityplayer).playerNetServerHandler
 						.sendPacket(new S27PacketExplosion(d0, d1, d2, f, explosion.getAffectedBlockPositions(),
@@ -921,8 +918,9 @@ public class WorldServer extends World implements IThreadListener {
 	public void addBlockEvent(BlockPos blockpos, Block block, int i, int j) {
 		BlockEventData blockeventdata = new BlockEventData(blockpos, block, i, j);
 
-		for (BlockEventData blockeventdata1 : this.field_147490_S[this.blockEventCacheIndex]) {
-			if (blockeventdata1.equals(blockeventdata)) {
+		ServerBlockEventList lst = this.field_147490_S[this.blockEventCacheIndex];
+		for (int k = 0, l = lst.size(); k < l; ++k) {
+			if (lst.get(k).equals(blockeventdata)) {
 				return;
 			}
 		}
@@ -935,7 +933,9 @@ public class WorldServer extends World implements IThreadListener {
 			int i = this.blockEventCacheIndex;
 			this.blockEventCacheIndex ^= 1;
 
-			for (BlockEventData blockeventdata : this.field_147490_S[i]) {
+			ServerBlockEventList lst = this.field_147490_S[i];
+			for (int k = 0, l = lst.size(); k < l; ++k) {
+				BlockEventData blockeventdata = lst.get(k);
 				if (this.fireBlockEvent(blockeventdata)) {
 					this.mcServer.getConfigurationManager().sendToAllNear((double) blockeventdata.getPosition().getX(),
 							(double) blockeventdata.getPosition().getY(), (double) blockeventdata.getPosition().getZ(),
diff --git a/src/main/java/net/minecraft/world/WorldServerMulti.java b/src/main/java/net/minecraft/world/WorldServerMulti.java
index be96e73..5c2f676 100755
--- a/src/main/java/net/minecraft/world/WorldServerMulti.java
+++ b/src/main/java/net/minecraft/world/WorldServerMulti.java
@@ -3,9 +3,6 @@ package net.minecraft.world;
 import net.minecraft.profiler.Profiler;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.village.VillageCollection;
-import net.minecraft.world.MinecraftException;
-import net.minecraft.world.World;
-import net.minecraft.world.WorldServer;
 import net.minecraft.world.border.IBorderListener;
 import net.minecraft.world.border.WorldBorder;
 import net.minecraft.world.storage.DerivedWorldInfo;
@@ -32,7 +29,6 @@ import net.minecraft.world.storage.ISaveHandler;
  * 
  */
 public class WorldServerMulti extends WorldServer {
-
 	private WorldServer delegate;
 
 	public WorldServerMulti(MinecraftServer server, ISaveHandler saveHandlerIn, int dimensionId, WorldServer delegate,
diff --git a/src/main/java/net/minecraft/world/WorldSettings.java b/src/main/java/net/minecraft/world/WorldSettings.java
index 32cbf54..9f46d5f 100755
--- a/src/main/java/net/minecraft/world/WorldSettings.java
+++ b/src/main/java/net/minecraft/world/WorldSettings.java
@@ -131,6 +131,8 @@ public final class WorldSettings {
 		NOT_SET(-1, ""), SURVIVAL(0, "survival"), CREATIVE(1, "creative"), ADVENTURE(2, "adventure"),
 		SPECTATOR(3, "spectator");
 
+		public static final GameType[] _VALUES = values();
+
 		int id;
 		String name;
 
@@ -180,7 +182,9 @@ public final class WorldSettings {
 		}
 
 		public static WorldSettings.GameType getByID(int idIn) {
-			for (WorldSettings.GameType worldsettings$gametype : values()) {
+			WorldSettings.GameType[] types = _VALUES;
+			for (int i = 0; i < types.length; ++i) {
+				WorldSettings.GameType worldsettings$gametype = types[i];
 				if (worldsettings$gametype.id == idIn) {
 					return worldsettings$gametype;
 				}
@@ -190,7 +194,9 @@ public final class WorldSettings {
 		}
 
 		public static WorldSettings.GameType getByName(String parString1) {
-			for (WorldSettings.GameType worldsettings$gametype : values()) {
+			WorldSettings.GameType[] types = _VALUES;
+			for (int i = 0; i < types.length; ++i) {
+				WorldSettings.GameType worldsettings$gametype = types[i];
 				if (worldsettings$gametype.name.equals(parString1)) {
 					return worldsettings$gametype;
 				}
diff --git a/src/main/java/net/minecraft/world/biome/BiomeCache.java b/src/main/java/net/minecraft/world/biome/BiomeCache.java
index 8354939..c76f95c 100755
--- a/src/main/java/net/minecraft/world/biome/BiomeCache.java
+++ b/src/main/java/net/minecraft/world/biome/BiomeCache.java
@@ -4,8 +4,6 @@ import com.google.common.collect.Lists;
 import java.util.List;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.LongHashMap;
-import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.biome.WorldChunkManager;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -28,7 +26,6 @@ import net.minecraft.world.biome.WorldChunkManager;
  * 
  */
 public class BiomeCache {
-
 	private final WorldChunkManager chunkManager;
 	private long lastCleanupTime;
 	/**+
diff --git a/src/main/java/net/minecraft/world/biome/BiomeDecorator.java b/src/main/java/net/minecraft/world/biome/BiomeDecorator.java
index 89deecf..f0559d2 100755
--- a/src/main/java/net/minecraft/world/biome/BiomeDecorator.java
+++ b/src/main/java/net/minecraft/world/biome/BiomeDecorator.java
@@ -7,7 +7,6 @@ import net.minecraft.block.material.Material;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.ChunkProviderSettings;
 import net.minecraft.world.gen.GeneratorBushFeature;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
diff --git a/src/main/java/net/minecraft/world/biome/BiomeEndDecorator.java b/src/main/java/net/minecraft/world/biome/BiomeEndDecorator.java
index a2a1a1f..c59f376 100755
--- a/src/main/java/net/minecraft/world/biome/BiomeEndDecorator.java
+++ b/src/main/java/net/minecraft/world/biome/BiomeEndDecorator.java
@@ -2,8 +2,6 @@ package net.minecraft.world.biome;
 
 import net.minecraft.entity.boss.EntityDragon;
 import net.minecraft.init.Blocks;
-import net.minecraft.world.biome.BiomeDecorator;
-import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.WorldGenSpikes;
 import net.minecraft.world.gen.feature.WorldGenerator;
 
diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenBase.java b/src/main/java/net/minecraft/world/biome/BiomeGenBase.java
index d9c6522..89006db 100755
--- a/src/main/java/net/minecraft/world/biome/BiomeGenBase.java
+++ b/src/main/java/net/minecraft/world/biome/BiomeGenBase.java
@@ -611,7 +611,8 @@ public abstract class BiomeGenBase {
 
 		explorationBiomesList.clear();
 
-		for (BiomeGenBase biomegenbase : biomeList) {
+		for (int i = 0; i < biomeList.length; ++i) {
+			BiomeGenBase biomegenbase = biomeList[i];
 			if (biomegenbase != null) {
 				if (BIOME_ID_MAP.containsKey(biomegenbase.biomeName)) {
 					throw new Error("Biome \"" + biomegenbase.biomeName + "\" is defined as both ID "
diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenForest.java b/src/main/java/net/minecraft/world/biome/BiomeGenForest.java
index c3b5d20..b0e0e93 100755
--- a/src/main/java/net/minecraft/world/biome/BiomeGenForest.java
+++ b/src/main/java/net/minecraft/world/biome/BiomeGenForest.java
@@ -91,8 +91,8 @@ public class BiomeGenForest extends BiomeGenBase {
 			double d0 = MathHelper.clamp_double((1.0D + GRASS_COLOR_NOISE
 					.func_151601_a((double) blockpos.getX() / 48.0D, (double) blockpos.getZ() / 48.0D)) / 2.0D, 0.0D,
 					0.9999D);
-			BlockFlower.EnumFlowerType blockflower$enumflowertype = BlockFlower.EnumFlowerType
-					.values()[(int) (d0 * (double) BlockFlower.EnumFlowerType.values().length)];
+			BlockFlower.EnumFlowerType blockflower$enumflowertype = BlockFlower.EnumFlowerType._VALUES[(int) (d0
+					* (double) BlockFlower.EnumFlowerType._VALUES.length)];
 			return blockflower$enumflowertype == BlockFlower.EnumFlowerType.BLUE_ORCHID
 					? BlockFlower.EnumFlowerType.POPPY
 					: blockflower$enumflowertype;
diff --git a/src/main/java/net/minecraft/world/biome/BiomeGenMesa.java b/src/main/java/net/minecraft/world/biome/BiomeGenMesa.java
index 86fa03d..2d79bea 100755
--- a/src/main/java/net/minecraft/world/biome/BiomeGenMesa.java
+++ b/src/main/java/net/minecraft/world/biome/BiomeGenMesa.java
@@ -11,7 +11,6 @@ import net.minecraft.init.Blocks;
 import net.minecraft.item.EnumDyeColor;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.chunk.ChunkPrimer;
 import net.minecraft.world.gen.NoiseGeneratorPerlin;
 import net.minecraft.world.gen.feature.WorldGenAbstractTree;
diff --git a/src/main/java/net/minecraft/world/biome/WorldChunkManager.java b/src/main/java/net/minecraft/world/biome/WorldChunkManager.java
index 36ff45b..0904492 100755
--- a/src/main/java/net/minecraft/world/biome/WorldChunkManager.java
+++ b/src/main/java/net/minecraft/world/biome/WorldChunkManager.java
@@ -9,8 +9,6 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.util.ReportedException;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldType;
-import net.minecraft.world.biome.BiomeCache;
-import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.layer.GenLayer;
 import net.minecraft.world.gen.layer.IntCache;
 
@@ -35,7 +33,6 @@ import net.minecraft.world.gen.layer.IntCache;
  * 
  */
 public class WorldChunkManager {
-
 	private GenLayer genBiomes;
 	private GenLayer biomeIndexLayer;
 	private BiomeCache biomeCache;
diff --git a/src/main/java/net/minecraft/world/biome/WorldChunkManagerHell.java b/src/main/java/net/minecraft/world/biome/WorldChunkManagerHell.java
index 5d4af33..fe68f7a 100755
--- a/src/main/java/net/minecraft/world/biome/WorldChunkManagerHell.java
+++ b/src/main/java/net/minecraft/world/biome/WorldChunkManagerHell.java
@@ -4,8 +4,6 @@ import java.util.Arrays;
 import java.util.List;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 import net.minecraft.util.BlockPos;
-import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.biome.WorldChunkManager;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -28,7 +26,6 @@ import net.minecraft.world.biome.WorldChunkManager;
  * 
  */
 public class WorldChunkManagerHell extends WorldChunkManager {
-
 	private BiomeGenBase biomeGenerator;
 	private float rainfall;
 
diff --git a/src/main/java/net/minecraft/world/border/WorldBorder.java b/src/main/java/net/minecraft/world/border/WorldBorder.java
index ab9b2e5..2ccc249 100755
--- a/src/main/java/net/minecraft/world/border/WorldBorder.java
+++ b/src/main/java/net/minecraft/world/border/WorldBorder.java
@@ -133,8 +133,9 @@ public class WorldBorder {
 		this.centerX = x;
 		this.centerZ = z;
 
-		for (IBorderListener iborderlistener : this.getListeners()) {
-			iborderlistener.onCenterChanged(this, x, z);
+		List<IBorderListener> lst = this.getListeners();
+		for (int i = 0, l = lst.size(); i < l; ++i) {
+			lst.get(i).onCenterChanged(this, x, z);
 		}
 
 	}
@@ -167,8 +168,9 @@ public class WorldBorder {
 		this.endTime = System.currentTimeMillis();
 		this.startTime = this.endTime;
 
-		for (IBorderListener iborderlistener : this.getListeners()) {
-			iborderlistener.onSizeChanged(this, newSize);
+		List<IBorderListener> lst = this.getListeners();
+		for (int i = 0, l = lst.size(); i < l; ++i) {
+			lst.get(i).onSizeChanged(this, newSize);
 		}
 
 	}
@@ -179,8 +181,9 @@ public class WorldBorder {
 		this.startTime = System.currentTimeMillis();
 		this.endTime = this.startTime + time;
 
-		for (IBorderListener iborderlistener : this.getListeners()) {
-			iborderlistener.onTransitionStarted(this, oldSize, newSize, time);
+		List<IBorderListener> lst = this.getListeners();
+		for (int i = 0, l = lst.size(); i < l; ++i) {
+			lst.get(i).onTransitionStarted(this, oldSize, newSize, time);
 		}
 
 	}
@@ -208,8 +211,9 @@ public class WorldBorder {
 	public void setDamageBuffer(double bufferSize) {
 		this.damageBuffer = bufferSize;
 
-		for (IBorderListener iborderlistener : this.getListeners()) {
-			iborderlistener.onDamageBufferChanged(this, bufferSize);
+		List<IBorderListener> lst = this.getListeners();
+		for (int i = 0, l = lst.size(); i < l; ++i) {
+			lst.get(i).onDamageBufferChanged(this, bufferSize);
 		}
 
 	}
@@ -221,8 +225,9 @@ public class WorldBorder {
 	public void setDamageAmount(double newAmount) {
 		this.damageAmount = newAmount;
 
-		for (IBorderListener iborderlistener : this.getListeners()) {
-			iborderlistener.onDamageAmountChanged(this, newAmount);
+		List<IBorderListener> lst = this.getListeners();
+		for (int i = 0, l = lst.size(); i < l; ++i) {
+			lst.get(i).onDamageAmountChanged(this, newAmount);
 		}
 
 	}
@@ -239,8 +244,9 @@ public class WorldBorder {
 	public void setWarningTime(int warningTime) {
 		this.warningTime = warningTime;
 
-		for (IBorderListener iborderlistener : this.getListeners()) {
-			iborderlistener.onWarningTimeChanged(this, warningTime);
+		List<IBorderListener> lst = this.getListeners();
+		for (int i = 0, l = lst.size(); i < l; ++i) {
+			lst.get(i).onWarningTimeChanged(this, warningTime);
 		}
 
 	}
@@ -252,8 +258,9 @@ public class WorldBorder {
 	public void setWarningDistance(int warningDistance) {
 		this.warningDistance = warningDistance;
 
-		for (IBorderListener iborderlistener : this.getListeners()) {
-			iborderlistener.onWarningDistanceChanged(this, warningDistance);
+		List<IBorderListener> lst = this.getListeners();
+		for (int i = 0, l = lst.size(); i < l; ++i) {
+			lst.get(i).onWarningDistanceChanged(this, warningDistance);
 		}
 
 	}
diff --git a/src/main/java/net/minecraft/world/chunk/Chunk.java b/src/main/java/net/minecraft/world/chunk/Chunk.java
index 222aaa9..4eb9d14 100755
--- a/src/main/java/net/minecraft/world/chunk/Chunk.java
+++ b/src/main/java/net/minecraft/world/chunk/Chunk.java
@@ -272,14 +272,17 @@ public class Chunk {
 						int i1 = this.zPosition * 16 + j;
 						int j1 = Integer.MAX_VALUE;
 
-						for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) {
+						EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+						for (int m = 0; m < facings.length; ++m) {
+							EnumFacing enumfacing = facings[m];
 							j1 = Math.min(j1, this.worldObj.getChunksLowestHorizon(l + enumfacing.getFrontOffsetX(),
 									i1 + enumfacing.getFrontOffsetZ()));
 						}
 
 						this.checkSkylightNeighborHeight(l, i1, j1);
 
-						for (EnumFacing enumfacing1 : EnumFacing.Plane.HORIZONTAL) {
+						for (int m = 0; m < facings.length; ++m) {
+							EnumFacing enumfacing1 = facings[m];
 							this.checkSkylightNeighborHeight(l + enumfacing1.getFrontOffsetX(),
 									i1 + enumfacing1.getFrontOffsetZ(), k);
 						}
@@ -398,7 +401,9 @@ public class Chunk {
 			}
 
 			if (!this.worldObj.provider.getHasNoSky()) {
-				for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) {
+				EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+				for (int m = 0; m < facings.length; ++m) {
+					EnumFacing enumfacing = facings[m];
 					this.updateSkylightNeighborHeight(k + enumfacing.getFrontOffsetX(),
 							l + enumfacing.getFrontOffsetZ(), j2, k2);
 				}
@@ -1200,13 +1205,14 @@ public class Chunk {
 			int l = this.queuedLightChecks / 256;
 			++this.queuedLightChecks;
 
+			EnumFacing[] facings = EnumFacing._VALUES;
 			for (int i1 = 0; i1 < 16; ++i1) {
 				BlockPos blockpos1 = blockpos.add(k, (j << 4) + i1, l);
 				boolean flag = i1 == 0 || i1 == 15 || k == 0 || k == 15 || l == 0 || l == 15;
 				if (this.storageArrays[j] == null && flag || this.storageArrays[j] != null
 						&& this.storageArrays[j].getBlockByExtId(k, i1, l).getMaterial() == Material.air) {
-					for (EnumFacing enumfacing : EnumFacing.values()) {
-						BlockPos blockpos2 = blockpos1.offset(enumfacing);
+					for (int m = 0; m < facings.length; ++m) {
+						BlockPos blockpos2 = blockpos1.offset(facings[m]);
 						if (this.worldObj.getBlockState(blockpos2).getBlock().getLightValue() > 0) {
 							this.worldObj.checkLight(blockpos2);
 						}
@@ -1236,7 +1242,9 @@ public class Chunk {
 				}
 
 				if (this.isLightPopulated) {
-					for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) {
+					EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+					for (int i = 0; i < facings.length; ++i) {
+						EnumFacing enumfacing = facings[i];
 						int k = enumfacing.getAxisDirection() == EnumFacing.AxisDirection.POSITIVE ? 16 : 1;
 						this.worldObj.getChunkFromBlockCoords(blockpos.offset(enumfacing, k))
 								.func_180700_a(enumfacing.getOpposite());
diff --git a/src/main/java/net/minecraft/world/chunk/storage/AnvilChunkLoader.java b/src/main/java/net/minecraft/world/chunk/storage/AnvilChunkLoader.java
index 432afa3..da9e46d 100755
--- a/src/main/java/net/minecraft/world/chunk/storage/AnvilChunkLoader.java
+++ b/src/main/java/net/minecraft/world/chunk/storage/AnvilChunkLoader.java
@@ -1,31 +1,18 @@
 package net.minecraft.world.chunk.storage;
 
-import java.io.DataInputStream;
-import java.io.DataOutput;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.Collections;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityList;
-import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.ChunkCoordIntPair;
-import net.minecraft.world.MinecraftException;
 import net.minecraft.world.NextTickListEntry;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.NibbleArray;
-import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
-import net.minecraft.world.chunk.storage.IChunkLoader;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
@@ -50,7 +37,6 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
  * 
  */
 public abstract class AnvilChunkLoader implements IChunkLoader {
-
 	private static final Logger logger = LogManager.getLogger("AnvilChunkLoader");
 
 	/**+
@@ -167,12 +153,13 @@ public abstract class AnvilChunkLoader implements IChunkLoader {
 		}
 
 		parNBTTagCompound.setTag("TileEntities", nbttaglist2);
-		List list = worldIn.getPendingBlockUpdates(chunkIn, false);
+		List<NextTickListEntry> list = worldIn.getPendingBlockUpdates(chunkIn, false);
 		if (list != null) {
 			long j1 = worldIn.getTotalWorldTime();
 			NBTTagList nbttaglist3 = new NBTTagList();
 
-			for (NextTickListEntry nextticklistentry : (List<NextTickListEntry>) list) {
+			for (int k = 0, l = list.size(); k < l; ++k) {
+				NextTickListEntry nextticklistentry = list.get(k);
 				NBTTagCompound nbttagcompound3 = new NBTTagCompound();
 				ResourceLocation resourcelocation = (ResourceLocation) Block.blockRegistry
 						.getNameForObject(nextticklistentry.getBlock());
diff --git a/src/main/java/net/minecraft/world/chunk/storage/ChunkLoader.java b/src/main/java/net/minecraft/world/chunk/storage/ChunkLoader.java
index 7dd6b9c..138a3ff 100755
--- a/src/main/java/net/minecraft/world/chunk/storage/ChunkLoader.java
+++ b/src/main/java/net/minecraft/world/chunk/storage/ChunkLoader.java
@@ -6,7 +6,6 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.biome.WorldChunkManager;
 import net.minecraft.world.chunk.NibbleArray;
-import net.minecraft.world.chunk.storage.NibbleArrayReader;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -29,7 +28,6 @@ import net.minecraft.world.chunk.storage.NibbleArrayReader;
  * 
  */
 public class ChunkLoader {
-
 	public static ChunkLoader.AnvilConverterData load(NBTTagCompound nbt) {
 		int i = nbt.getInteger("xPos");
 		int j = nbt.getInteger("zPos");
diff --git a/src/main/java/net/minecraft/world/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/chunk/storage/RegionFile.java
index 4c60e64..6fcfcbe 100755
--- a/src/main/java/net/minecraft/world/chunk/storage/RegionFile.java
+++ b/src/main/java/net/minecraft/world/chunk/storage/RegionFile.java
@@ -1,8 +1,6 @@
 package net.minecraft.world.chunk.storage;
 
 import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -10,6 +8,8 @@ import java.util.List;
 
 import com.google.common.collect.Lists;
 
+import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
+import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
 import net.lax1dude.eaglercraft.v1_8.EaglerZLIB;
 import net.lax1dude.eaglercraft.v1_8.sp.server.export.RandomAccessMemoryFile;
 
@@ -124,12 +124,12 @@ public class RegionFile {
 								byte[] abyte1 = new byte[l - 1];
 								this.dataFile.read(abyte1);
 								return new DataInputStream(new BufferedInputStream(
-										EaglerZLIB.newGZIPInputStream(new ByteArrayInputStream(abyte1))));
+										EaglerZLIB.newGZIPInputStream(new EaglerInputStream(abyte1))));
 							} else if (b0 == 2) {
 								byte[] abyte = new byte[l - 1];
 								this.dataFile.read(abyte);
 								return new DataInputStream(new BufferedInputStream(
-										EaglerZLIB.newInflaterInputStream(new ByteArrayInputStream(abyte))));
+										EaglerZLIB.newInflaterInputStream(new EaglerInputStream(abyte))));
 							} else {
 								return null;
 							}
@@ -277,7 +277,7 @@ public class RegionFile {
 		return dataFile;
 	}
 
-	class ChunkBuffer extends ByteArrayOutputStream {
+	class ChunkBuffer extends EaglerOutputStream {
 		private int chunkX;
 		private int chunkZ;
 
diff --git a/src/main/java/net/minecraft/world/demo/DemoWorldManager.java b/src/main/java/net/minecraft/world/demo/DemoWorldManager.java
index 6d96d47..d6e0825 100755
--- a/src/main/java/net/minecraft/world/demo/DemoWorldManager.java
+++ b/src/main/java/net/minecraft/world/demo/DemoWorldManager.java
@@ -30,7 +30,6 @@ import net.minecraft.world.World;
  * 
  */
 public class DemoWorldManager extends ItemInWorldManager {
-
 	private boolean field_73105_c;
 	private boolean demoTimeExpired;
 	private int field_73104_e;
diff --git a/src/main/java/net/minecraft/world/demo/DemoWorldServer.java b/src/main/java/net/minecraft/world/demo/DemoWorldServer.java
index f208b2f..1717765 100755
--- a/src/main/java/net/minecraft/world/demo/DemoWorldServer.java
+++ b/src/main/java/net/minecraft/world/demo/DemoWorldServer.java
@@ -31,7 +31,6 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion;
  * 
  */
 public class DemoWorldServer extends WorldServer {
-
 	private static final long demoWorldSeed = EaglercraftVersion.demoWorldSeed;
 	public static final WorldSettings demoWorldSettings = (new WorldSettings(demoWorldSeed,
 			WorldSettings.GameType.SURVIVAL, true, false, WorldType.DEFAULT)).enableBonusChest();
diff --git a/src/main/java/net/minecraft/world/gen/ChunkProviderDebug.java b/src/main/java/net/minecraft/world/gen/ChunkProviderDebug.java
index f14519f..941fed1 100755
--- a/src/main/java/net/minecraft/world/gen/ChunkProviderDebug.java
+++ b/src/main/java/net/minecraft/world/gen/ChunkProviderDebug.java
@@ -36,7 +36,6 @@ import net.minecraft.world.chunk.IChunkProvider;
  * 
  */
 public class ChunkProviderDebug implements IChunkProvider {
-
 	private static final List<IBlockState> field_177464_a = Lists.newArrayList();
 	private static final int field_177462_b;
 	private static final int field_181039_c;
diff --git a/src/main/java/net/minecraft/world/gen/ChunkProviderEnd.java b/src/main/java/net/minecraft/world/gen/ChunkProviderEnd.java
index 4772e8e..a54e445 100755
--- a/src/main/java/net/minecraft/world/gen/ChunkProviderEnd.java
+++ b/src/main/java/net/minecraft/world/gen/ChunkProviderEnd.java
@@ -15,7 +15,6 @@ import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.ChunkPrimer;
 import net.minecraft.world.chunk.IChunkProvider;
-import net.minecraft.world.gen.NoiseGeneratorOctaves;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -38,7 +37,6 @@ import net.minecraft.world.gen.NoiseGeneratorOctaves;
  * 
  */
 public class ChunkProviderEnd implements IChunkProvider {
-
 	private EaglercraftRandom endRNG;
 	private NoiseGeneratorOctaves noiseGen1;
 	private NoiseGeneratorOctaves noiseGen2;
diff --git a/src/main/java/net/minecraft/world/gen/ChunkProviderFlat.java b/src/main/java/net/minecraft/world/gen/ChunkProviderFlat.java
index ee39de0..a4679d2 100755
--- a/src/main/java/net/minecraft/world/gen/ChunkProviderFlat.java
+++ b/src/main/java/net/minecraft/world/gen/ChunkProviderFlat.java
@@ -15,9 +15,6 @@ import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.ChunkPrimer;
 import net.minecraft.world.chunk.IChunkProvider;
-import net.minecraft.world.gen.FlatGeneratorInfo;
-import net.minecraft.world.gen.FlatLayerInfo;
-import net.minecraft.world.gen.MapGenBase;
 import net.minecraft.world.gen.feature.WorldGenDungeons;
 import net.minecraft.world.gen.feature.WorldGenLakes;
 import net.minecraft.world.gen.structure.MapGenMineshaft;
@@ -48,7 +45,6 @@ import net.minecraft.world.gen.structure.StructureOceanMonument;
  * 
  */
 public class ChunkProviderFlat implements IChunkProvider {
-
 	private World worldObj;
 	private EaglercraftRandom random;
 	private final IBlockState[] cachedBlockIDs = new IBlockState[256];
@@ -183,7 +179,8 @@ public class ChunkProviderFlat implements IChunkProvider {
 		this.random.setSeed((long) i * i1 + (long) j * j1 ^ this.worldObj.getSeed());
 		ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i, j);
 
-		for (MapGenStructure mapgenstructure : this.structureGenerators) {
+		for (int m = 0, n = this.structureGenerators.size(); m < n; ++m) {
+			MapGenStructure mapgenstructure = this.structureGenerators.get(m);
 			boolean flag1 = mapgenstructure.generateStructure(this.worldObj, this.random, chunkcoordintpair);
 			if (mapgenstructure instanceof MapGenVillage) {
 				flag |= flag1;
@@ -267,7 +264,8 @@ public class ChunkProviderFlat implements IChunkProvider {
 
 	public BlockPos getStrongholdGen(World world, String s, BlockPos blockpos) {
 		if ("Stronghold".equals(s)) {
-			for (MapGenStructure mapgenstructure : this.structureGenerators) {
+			for (int m = 0, n = this.structureGenerators.size(); m < n; ++m) {
+				MapGenStructure mapgenstructure = this.structureGenerators.get(m);
 				if (mapgenstructure instanceof MapGenStronghold) {
 					return mapgenstructure.getClosestStrongholdPos(world, blockpos);
 				}
@@ -282,8 +280,8 @@ public class ChunkProviderFlat implements IChunkProvider {
 	}
 
 	public void recreateStructures(Chunk var1, int i, int j) {
-		for (MapGenStructure mapgenstructure : this.structureGenerators) {
-			mapgenstructure.generate(this, this.worldObj, i, j, (ChunkPrimer) null);
+		for (int m = 0, n = this.structureGenerators.size(); m < n; ++m) {
+			this.structureGenerators.get(m).generate(this, this.worldObj, i, j, (ChunkPrimer) null);
 		}
 
 	}
diff --git a/src/main/java/net/minecraft/world/gen/ChunkProviderGenerate.java b/src/main/java/net/minecraft/world/gen/ChunkProviderGenerate.java
index 8b69b88..bb4504c 100755
--- a/src/main/java/net/minecraft/world/gen/ChunkProviderGenerate.java
+++ b/src/main/java/net/minecraft/world/gen/ChunkProviderGenerate.java
@@ -17,12 +17,6 @@ import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.ChunkPrimer;
 import net.minecraft.world.chunk.IChunkProvider;
-import net.minecraft.world.gen.ChunkProviderSettings;
-import net.minecraft.world.gen.MapGenBase;
-import net.minecraft.world.gen.MapGenCaves;
-import net.minecraft.world.gen.MapGenRavine;
-import net.minecraft.world.gen.NoiseGeneratorOctaves;
-import net.minecraft.world.gen.NoiseGeneratorPerlin;
 import net.minecraft.world.gen.feature.WorldGenDungeons;
 import net.minecraft.world.gen.feature.WorldGenLakes;
 import net.minecraft.world.gen.structure.MapGenMineshaft;
@@ -52,7 +46,6 @@ import net.minecraft.world.gen.structure.StructureOceanMonument;
  * 
  */
 public class ChunkProviderGenerate implements IChunkProvider {
-
 	private EaglercraftRandom rand;
 	private NoiseGeneratorOctaves field_147431_j;
 	private NoiseGeneratorOctaves field_147432_k;
diff --git a/src/main/java/net/minecraft/world/gen/ChunkProviderHell.java b/src/main/java/net/minecraft/world/gen/ChunkProviderHell.java
index fa55d5d..17f9d76 100755
--- a/src/main/java/net/minecraft/world/gen/ChunkProviderHell.java
+++ b/src/main/java/net/minecraft/world/gen/ChunkProviderHell.java
@@ -17,10 +17,6 @@ import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.ChunkPrimer;
 import net.minecraft.world.chunk.IChunkProvider;
-import net.minecraft.world.gen.GeneratorBushFeature;
-import net.minecraft.world.gen.MapGenBase;
-import net.minecraft.world.gen.MapGenCavesHell;
-import net.minecraft.world.gen.NoiseGeneratorOctaves;
 import net.minecraft.world.gen.feature.WorldGenFire;
 import net.minecraft.world.gen.feature.WorldGenGlowStone1;
 import net.minecraft.world.gen.feature.WorldGenGlowStone2;
@@ -50,7 +46,6 @@ import net.minecraft.world.gen.structure.MapGenNetherBridge;
  * 
  */
 public class ChunkProviderHell implements IChunkProvider {
-
 	private final World worldObj;
 	private final boolean field_177466_i;
 	private final EaglercraftRandom hellRNG;
diff --git a/src/main/java/net/minecraft/world/gen/ChunkProviderServer.java b/src/main/java/net/minecraft/world/gen/ChunkProviderServer.java
index 8c38d92..c4fa4ee 100755
--- a/src/main/java/net/minecraft/world/gen/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/world/gen/ChunkProviderServer.java
@@ -49,7 +49,6 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
  * 
  */
 public class ChunkProviderServer implements IChunkProvider {
-
 	private static final Logger logger = LogManager.getLogger();
 	private Set<Long> droppedChunksSet = Collections.newSetFromMap(new ConcurrentHashMap());
 	private Chunk dummyChunk;
@@ -64,7 +63,7 @@ public class ChunkProviderServer implements IChunkProvider {
 	 * map of chunk Id's to Chunk instances
 	 */
 	private LongHashMap<Chunk> id2ChunkMap = new LongHashMap();
-	private List<Chunk> loadedChunks = Lists.newArrayList();
+	private List<Chunk> loadedChunks = Lists.newLinkedList();
 	private WorldServer worldObj;
 
 	public ChunkProviderServer(WorldServer parWorldServer, IChunkLoader parIChunkLoader,
@@ -240,7 +239,7 @@ public class ChunkProviderServer implements IChunkProvider {
 		int i = 0;
 		ArrayList arraylist = Lists.newArrayList(this.loadedChunks);
 
-		for (int j = 0; j < arraylist.size(); ++j) {
+		for (int j = 0, l = arraylist.size(); j < l; ++j) {
 			Chunk chunk = (Chunk) arraylist.get(j);
 			if (flag) {
 				this.saveChunkExtraData(chunk);
diff --git a/src/main/java/net/minecraft/world/gen/FlatGeneratorInfo.java b/src/main/java/net/minecraft/world/gen/FlatGeneratorInfo.java
index 78ff9d0..70b2165 100755
--- a/src/main/java/net/minecraft/world/gen/FlatGeneratorInfo.java
+++ b/src/main/java/net/minecraft/world/gen/FlatGeneratorInfo.java
@@ -71,7 +71,8 @@ public class FlatGeneratorInfo {
 	public void func_82645_d() {
 		int i = 0;
 
-		for (FlatLayerInfo flatlayerinfo : this.flatLayers) {
+		for (int j = 0, l = this.flatLayers.size(); j < l; ++j) {
+			FlatLayerInfo flatlayerinfo = this.flatLayers.get(j);
 			flatlayerinfo.setMinY(i);
 			i += flatlayerinfo.getLayerCount();
 		}
@@ -197,8 +198,8 @@ public class FlatGeneratorInfo {
 			String[] astring = parString1.split(",");
 			int i = 0;
 
-			for (String s : astring) {
-				FlatLayerInfo flatlayerinfo = func_180715_a(parInt1, s, i);
+			for (int j = 0; j < astring.length; ++j) {
+				FlatLayerInfo flatlayerinfo = func_180715_a(parInt1, astring[j], i);
 				if (flatlayerinfo == null) {
 					return null;
 				}
@@ -235,8 +236,8 @@ public class FlatGeneratorInfo {
 					if (i > 0 && astring.length > j) {
 						String[] astring1 = astring[j++].toLowerCase().split(",");
 
-						for (String s : astring1) {
-							String[] astring2 = s.split("\\(", 2);
+						for (int m = 0; m < astring1.length; ++m) {
+							String[] astring2 = astring1[m].split("\\(", 2);
 							HashMap hashmap = Maps.newHashMap();
 							if (astring2[0].length() > 0) {
 								flatgeneratorinfo.getWorldFeatures().put(astring2[0], hashmap);
diff --git a/src/main/java/net/minecraft/world/gen/MapGenBase.java b/src/main/java/net/minecraft/world/gen/MapGenBase.java
index 1d581a2..dc041a1 100755
--- a/src/main/java/net/minecraft/world/gen/MapGenBase.java
+++ b/src/main/java/net/minecraft/world/gen/MapGenBase.java
@@ -26,7 +26,6 @@ import net.minecraft.world.chunk.IChunkProvider;
  * 
  */
 public class MapGenBase {
-
 	/**+
 	 * The number of Chunks to gen-check in any given direction.
 	 */
diff --git a/src/main/java/net/minecraft/world/gen/MapGenCaves.java b/src/main/java/net/minecraft/world/gen/MapGenCaves.java
index e3f12c0..552b6ab 100755
--- a/src/main/java/net/minecraft/world/gen/MapGenCaves.java
+++ b/src/main/java/net/minecraft/world/gen/MapGenCaves.java
@@ -10,7 +10,6 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.ChunkPrimer;
-import net.minecraft.world.gen.MapGenBase;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -33,7 +32,6 @@ import net.minecraft.world.gen.MapGenBase;
  * 
  */
 public class MapGenCaves extends MapGenBase {
-
 	protected void func_180703_a(long parLong1, int parInt1, int parInt2, ChunkPrimer parChunkPrimer, double parDouble1,
 			double parDouble2, double parDouble3) {
 		this.func_180702_a(parLong1, parInt1, parInt2, parChunkPrimer, parDouble1, parDouble2, parDouble3,
diff --git a/src/main/java/net/minecraft/world/gen/MapGenCavesHell.java b/src/main/java/net/minecraft/world/gen/MapGenCavesHell.java
index b27c04e..b988139 100755
--- a/src/main/java/net/minecraft/world/gen/MapGenCavesHell.java
+++ b/src/main/java/net/minecraft/world/gen/MapGenCavesHell.java
@@ -6,7 +6,6 @@ import net.minecraft.init.Blocks;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.ChunkPrimer;
-import net.minecraft.world.gen.MapGenBase;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -29,7 +28,6 @@ import net.minecraft.world.gen.MapGenBase;
  * 
  */
 public class MapGenCavesHell extends MapGenBase {
-
 	protected void func_180705_a(long parLong1, int parInt1, int parInt2, ChunkPrimer parChunkPrimer, double parDouble1,
 			double parDouble2, double parDouble3) {
 		this.func_180704_a(parLong1, parInt1, parInt2, parChunkPrimer, parDouble1, parDouble2, parDouble3,
diff --git a/src/main/java/net/minecraft/world/gen/MapGenRavine.java b/src/main/java/net/minecraft/world/gen/MapGenRavine.java
index 731329e..de9e318 100755
--- a/src/main/java/net/minecraft/world/gen/MapGenRavine.java
+++ b/src/main/java/net/minecraft/world/gen/MapGenRavine.java
@@ -7,7 +7,6 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.ChunkPrimer;
-import net.minecraft.world.gen.MapGenBase;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -30,7 +29,6 @@ import net.minecraft.world.gen.MapGenBase;
  * 
  */
 public class MapGenRavine extends MapGenBase {
-
 	private float[] field_75046_d = new float[1024];
 
 	protected void func_180707_a(long parLong1, int parInt1, int parInt2, ChunkPrimer parChunkPrimer, double parDouble1,
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenAbstractTree.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenAbstractTree.java
index c9e4d88..dec881f 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenAbstractTree.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenAbstractTree.java
@@ -6,7 +6,6 @@ import net.minecraft.block.material.Material;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -29,7 +28,6 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public abstract class WorldGenAbstractTree extends WorldGenerator {
-
 	public WorldGenAbstractTree(boolean parFlag) {
 		super(parFlag);
 	}
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenBigMushroom.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenBigMushroom.java
index 40d436d..e5f314d 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenBigMushroom.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenBigMushroom.java
@@ -7,7 +7,6 @@ import net.minecraft.block.material.Material;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -30,7 +29,6 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public class WorldGenBigMushroom extends WorldGenerator {
-
 	private Block mushroomType;
 
 	public WorldGenBigMushroom(Block parBlock) {
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenBigTree.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenBigTree.java
index 18d1618..8b5f46f 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenBigTree.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenBigTree.java
@@ -12,7 +12,6 @@ import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -35,7 +34,6 @@ import net.minecraft.world.gen.feature.WorldGenAbstractTree;
  * 
  */
 public class WorldGenBigTree extends WorldGenAbstractTree {
-
 	private EaglercraftRandom rand;
 	private World world;
 	private BlockPos basePos = BlockPos.ORIGIN;
@@ -206,8 +204,8 @@ public class WorldGenBigTree extends WorldGenAbstractTree {
 	 * leafNodes list.
 	 */
 	void generateLeaves() {
-		for (WorldGenBigTree.FoliageCoordinates worldgenbigtree$foliagecoordinates : this.field_175948_j) {
-			this.generateLeafNode(worldgenbigtree$foliagecoordinates);
+		for (int i = 0, l = this.field_175948_j.size(); i < l; ++i) {
+			this.generateLeafNode(this.field_175948_j.get(i));
 		}
 
 	}
@@ -243,7 +241,8 @@ public class WorldGenBigTree extends WorldGenAbstractTree {
 	 * different leaf nodes that would otherwise degrade.
 	 */
 	void generateLeafNodeBases() {
-		for (WorldGenBigTree.FoliageCoordinates worldgenbigtree$foliagecoordinates : this.field_175948_j) {
+		for (int j = 0, l = this.field_175948_j.size(); j < l; ++j) {
+			WorldGenBigTree.FoliageCoordinates worldgenbigtree$foliagecoordinates = this.field_175948_j.get(j);
 			int i = worldgenbigtree$foliagecoordinates.func_177999_q();
 			BlockPos blockpos = new BlockPos(this.basePos.getX(), i, this.basePos.getZ());
 			if (!blockpos.equals(worldgenbigtree$foliagecoordinates)
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenBlockBlob.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenBlockBlob.java
index 789e724..660b57c 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenBlockBlob.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenBlockBlob.java
@@ -5,7 +5,6 @@ import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -28,7 +27,6 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public class WorldGenBlockBlob extends WorldGenerator {
-
 	private final Block field_150545_a;
 	private final int field_150544_b;
 
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenCactus.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenCactus.java
index 899c75f..c4ef67a 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenCactus.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenCactus.java
@@ -4,7 +4,6 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -27,7 +26,6 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public class WorldGenCactus extends WorldGenerator {
-
 	public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) {
 		for (int i = 0; i < 10; ++i) {
 			BlockPos blockpos1 = blockpos.add(random.nextInt(8) - random.nextInt(8),
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenCanopyTree.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenCanopyTree.java
index e825e9e..fda7c3f 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenCanopyTree.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenCanopyTree.java
@@ -12,7 +12,6 @@ import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -35,7 +34,6 @@ import net.minecraft.world.gen.feature.WorldGenAbstractTree;
  * 
  */
 public class WorldGenCanopyTree extends WorldGenAbstractTree {
-
 	private static final IBlockState field_181640_a = Blocks.log2.getDefaultState().withProperty(BlockNewLog.VARIANT,
 			BlockPlanks.EnumType.DARK_OAK);
 	private static final IBlockState field_181641_b = Blocks.leaves2.getDefaultState()
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenClay.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenClay.java
index cdf1d1b..1309eaa 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenClay.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenClay.java
@@ -6,7 +6,6 @@ import net.minecraft.block.material.Material;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -29,7 +28,6 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public class WorldGenClay extends WorldGenerator {
-
 	private Block field_150546_a = Blocks.clay;
 	private int numberOfBlocks;
 
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenDeadBush.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenDeadBush.java
index fce64a8..3d89e61 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenDeadBush.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenDeadBush.java
@@ -6,7 +6,6 @@ import net.minecraft.block.material.Material;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -29,7 +28,6 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public class WorldGenDeadBush extends WorldGenerator {
-
 	public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) {
 		Block block;
 		while (((block = world.getBlockState(blockpos).getBlock()).getMaterial() == Material.air
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenDesertWells.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenDesertWells.java
index c5b2210..062dd65 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenDesertWells.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenDesertWells.java
@@ -11,7 +11,6 @@ import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -34,7 +33,6 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public class WorldGenDesertWells extends WorldGenerator {
-
 	private static final BlockStateHelper field_175913_a = BlockStateHelper.forBlock(Blocks.sand)
 			.where(BlockSand.VARIANT, Predicates.equalTo(BlockSand.EnumType.SAND));
 	private final IBlockState field_175911_b = Blocks.stone_slab.getDefaultState()
@@ -69,8 +67,9 @@ public class WorldGenDesertWells extends WorldGenerator {
 
 			world.setBlockState(blockpos, this.field_175910_d, 2);
 
-			for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) {
-				world.setBlockState(blockpos.offset(enumfacing), this.field_175910_d, 2);
+			EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+			for (int i = 0; i < facings.length; ++i) {
+				world.setBlockState(blockpos.offset(facings[i]), this.field_175910_d, 2);
 			}
 
 			for (int i1 = -2; i1 <= 2; ++i1) {
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenDoublePlant.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenDoublePlant.java
index b92bf62..0d38a51 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenDoublePlant.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenDoublePlant.java
@@ -5,7 +5,6 @@ import net.minecraft.block.BlockDoublePlant;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -28,7 +27,6 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public class WorldGenDoublePlant extends WorldGenerator {
-
 	private BlockDoublePlant.EnumPlantType field_150549_a;
 
 	public void setPlantType(BlockDoublePlant.EnumPlantType parEnumPlantType) {
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenDungeons.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenDungeons.java
index 29a872e..79dc595 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenDungeons.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenDungeons.java
@@ -13,7 +13,6 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.WeightedRandomChestContent;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
@@ -38,7 +37,6 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
  * 
  */
 public class WorldGenDungeons extends WorldGenerator {
-
 	private static final Logger field_175918_a = LogManager.getLogger();
 	private static final String[] SPAWNERTYPES = new String[] { "Skeleton", "Zombie", "Zombie", "Spider" };
 	private static final List<WeightedRandomChestContent> CHESTCONTENT = Lists
@@ -125,8 +123,9 @@ public class WorldGenDungeons extends WorldGenerator {
 					if (world.isAirBlock(blockpos3)) {
 						int k2 = 0;
 
-						for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) {
-							if (world.getBlockState(blockpos3.offset(enumfacing)).getBlock().getMaterial().isSolid()) {
+						EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+						for (int m = 0; m < facings.length; ++m) {
+							if (world.getBlockState(blockpos3.offset(facings[m])).getBlock().getMaterial().isSolid()) {
 								++k2;
 							}
 						}
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenFire.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenFire.java
index 9022a4f..64a3e32 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenFire.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenFire.java
@@ -4,7 +4,6 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -27,7 +26,6 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public class WorldGenFire extends WorldGenerator {
-
 	public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) {
 		for (int i = 0; i < 64; ++i) {
 			BlockPos blockpos1 = blockpos.add(random.nextInt(8) - random.nextInt(8),
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenFlowers.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenFlowers.java
index 5c75b63..45512f2 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenFlowers.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenFlowers.java
@@ -5,7 +5,6 @@ import net.minecraft.block.BlockFlower;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -28,7 +27,6 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public class WorldGenFlowers extends WorldGenerator {
-
 	private BlockFlower flower;
 	private IBlockState field_175915_b;
 
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenForest.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenForest.java
index 6509cfe..8764943 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenForest.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenForest.java
@@ -10,7 +10,6 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -33,7 +32,6 @@ import net.minecraft.world.gen.feature.WorldGenAbstractTree;
  * 
  */
 public class WorldGenForest extends WorldGenAbstractTree {
-
 	private static final IBlockState field_181629_a = Blocks.log.getDefaultState().withProperty(BlockOldLog.VARIANT,
 			BlockPlanks.EnumType.BIRCH);
 	private static final IBlockState field_181630_b = Blocks.leaves.getDefaultState()
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenGlowStone1.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenGlowStone1.java
index 16cc920..7e04988 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenGlowStone1.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenGlowStone1.java
@@ -6,7 +6,6 @@ import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -29,11 +28,12 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public class WorldGenGlowStone1 extends WorldGenerator {
-
 	public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) {
+		BlockPos tmp;
 		if (!world.isAirBlock(blockpos)) {
 			return false;
-		} else if (world.getBlockState(blockpos.up()).getBlock() != Blocks.netherrack) {
+		} else if (world.getBlockState(blockpos.offsetEvenFaster(EnumFacing.UP, tmp = new BlockPos(0, 0, 0)))
+				.getBlock() != Blocks.netherrack) {
 			return false;
 		} else {
 			world.setBlockState(blockpos, Blocks.glowstone.getDefaultState(), 2);
@@ -44,8 +44,10 @@ public class WorldGenGlowStone1 extends WorldGenerator {
 				if (world.getBlockState(blockpos1).getBlock().getMaterial() == Material.air) {
 					int j = 0;
 
-					for (EnumFacing enumfacing : EnumFacing.values()) {
-						if (world.getBlockState(blockpos1.offset(enumfacing)).getBlock() == Blocks.glowstone) {
+					EnumFacing[] facings = EnumFacing._VALUES;
+					for (int k = 0; k < facings.length; ++k) {
+						if (world.getBlockState(blockpos1.offsetEvenFaster(facings[k], tmp))
+								.getBlock() == Blocks.glowstone) {
 							++j;
 						}
 
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenGlowStone2.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenGlowStone2.java
index 3d338b2..017e5d7 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenGlowStone2.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenGlowStone2.java
@@ -6,7 +6,6 @@ import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -29,11 +28,12 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public class WorldGenGlowStone2 extends WorldGenerator {
-
 	public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) {
+		BlockPos tmp;
 		if (!world.isAirBlock(blockpos)) {
 			return false;
-		} else if (world.getBlockState(blockpos.up()).getBlock() != Blocks.netherrack) {
+		} else if (world.getBlockState(blockpos.offsetEvenFaster(EnumFacing.UP, tmp = new BlockPos(0, 0, 0)))
+				.getBlock() != Blocks.netherrack) {
 			return false;
 		} else {
 			world.setBlockState(blockpos, Blocks.glowstone.getDefaultState(), 2);
@@ -44,8 +44,10 @@ public class WorldGenGlowStone2 extends WorldGenerator {
 				if (world.getBlockState(blockpos1).getBlock().getMaterial() == Material.air) {
 					int j = 0;
 
-					for (EnumFacing enumfacing : EnumFacing.values()) {
-						if (world.getBlockState(blockpos1.offset(enumfacing)).getBlock() == Blocks.glowstone) {
+					EnumFacing[] facings = EnumFacing._VALUES;
+					for (int k = 0; k < facings.length; ++k) {
+						if (world.getBlockState(blockpos1.offsetEvenFaster(facings[k], tmp))
+								.getBlock() == Blocks.glowstone) {
 							++j;
 						}
 
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenHellLava.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenHellLava.java
index 8e600f5..8b7041c 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenHellLava.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenHellLava.java
@@ -6,7 +6,6 @@ import net.minecraft.block.material.Material;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -29,7 +28,6 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public class WorldGenHellLava extends WorldGenerator {
-
 	private final Block field_150553_a;
 	private final boolean field_94524_b;
 
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenHugeTrees.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenHugeTrees.java
index b3d841f..092e768 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenHugeTrees.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenHugeTrees.java
@@ -7,7 +7,6 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -30,7 +29,6 @@ import net.minecraft.world.gen.feature.WorldGenAbstractTree;
  * 
  */
 public abstract class WorldGenHugeTrees extends WorldGenAbstractTree {
-
 	protected final int baseHeight;
 	protected final IBlockState woodMetadata;
 	protected final IBlockState leavesMetadata;
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenIcePath.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenIcePath.java
index 18a2aeb..deb6fce 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenIcePath.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenIcePath.java
@@ -5,7 +5,6 @@ import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -28,7 +27,6 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public class WorldGenIcePath extends WorldGenerator {
-
 	private Block block = Blocks.packed_ice;
 	private int basePathWidth;
 
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenIceSpike.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenIceSpike.java
index 951e513..e1695bf 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenIceSpike.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenIceSpike.java
@@ -7,7 +7,6 @@ import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -30,7 +29,6 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public class WorldGenIceSpike extends WorldGenerator {
-
 	public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) {
 		while (world.isAirBlock(blockpos) && blockpos.getY() > 2) {
 			blockpos = blockpos.down();
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenLakes.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenLakes.java
index 1b198d0..783b82f 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenLakes.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenLakes.java
@@ -8,7 +8,6 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.world.EnumSkyBlock;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -31,7 +30,6 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public class WorldGenLakes extends WorldGenerator {
-
 	private Block block;
 
 	public WorldGenLakes(Block blockIn) {
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenLiquids.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenLiquids.java
index 34a1d81..499987a 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenLiquids.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenLiquids.java
@@ -6,7 +6,6 @@ import net.minecraft.block.material.Material;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -29,7 +28,6 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public class WorldGenLiquids extends WorldGenerator {
-
 	private Block block;
 
 	public WorldGenLiquids(Block parBlock) {
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenMegaJungle.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenMegaJungle.java
index 46d113a..abe8f9c 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenMegaJungle.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenMegaJungle.java
@@ -8,7 +8,6 @@ import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenHugeTrees;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -31,7 +30,6 @@ import net.minecraft.world.gen.feature.WorldGenHugeTrees;
  * 
  */
 public class WorldGenMegaJungle extends WorldGenHugeTrees {
-
 	public WorldGenMegaJungle(boolean parFlag, int parInt1, int parInt2, IBlockState parIBlockState,
 			IBlockState parIBlockState2) {
 		super(parFlag, parInt1, parInt2, parIBlockState, parIBlockState2);
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenMegaPineTree.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenMegaPineTree.java
index 2dc3e23..596d3ec 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenMegaPineTree.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenMegaPineTree.java
@@ -13,7 +13,6 @@ import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenHugeTrees;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -36,7 +35,6 @@ import net.minecraft.world.gen.feature.WorldGenHugeTrees;
  * 
  */
 public class WorldGenMegaPineTree extends WorldGenHugeTrees {
-
 	private static final IBlockState field_181633_e = Blocks.log.getDefaultState().withProperty(BlockOldLog.VARIANT,
 			BlockPlanks.EnumType.SPRUCE);
 	private static final IBlockState field_181634_f = Blocks.leaves.getDefaultState()
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenMelon.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenMelon.java
index d04dccf..09ba60b 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenMelon.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenMelon.java
@@ -4,7 +4,6 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -27,7 +26,6 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public class WorldGenMelon extends WorldGenerator {
-
 	public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) {
 		for (int i = 0; i < 64; ++i) {
 			BlockPos blockpos1 = blockpos.add(random.nextInt(8) - random.nextInt(8),
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenMinable.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenMinable.java
index 0da39c7..7947f97 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenMinable.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenMinable.java
@@ -8,7 +8,6 @@ import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -31,7 +30,6 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public class WorldGenMinable extends WorldGenerator {
-
 	private final IBlockState oreBlock;
 	private final int numberOfBlocks;
 	private final Predicate<IBlockState> predicate;
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenPumpkin.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenPumpkin.java
index 2854464..d54191a 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenPumpkin.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenPumpkin.java
@@ -6,7 +6,6 @@ import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -29,7 +28,6 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public class WorldGenPumpkin extends WorldGenerator {
-
 	public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) {
 		for (int i = 0; i < 64; ++i) {
 			BlockPos blockpos1 = blockpos.add(random.nextInt(8) - random.nextInt(8),
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenReed.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenReed.java
index 34e48d7..78d9c43 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenReed.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenReed.java
@@ -5,7 +5,6 @@ import net.minecraft.block.material.Material;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -28,7 +27,6 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public class WorldGenReed extends WorldGenerator {
-
 	public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) {
 		for (int i = 0; i < 20; ++i) {
 			BlockPos blockpos1 = blockpos.add(random.nextInt(4) - random.nextInt(4), 0,
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenSand.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenSand.java
index e6e168f..3b473d8 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenSand.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenSand.java
@@ -6,7 +6,6 @@ import net.minecraft.block.material.Material;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -29,7 +28,6 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public class WorldGenSand extends WorldGenerator {
-
 	private Block block;
 	private int radius;
 
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenSavannaTree.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenSavannaTree.java
index 986696c..6882fd0 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenSavannaTree.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenSavannaTree.java
@@ -12,7 +12,6 @@ import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -35,7 +34,6 @@ import net.minecraft.world.gen.feature.WorldGenAbstractTree;
  * 
  */
 public class WorldGenSavannaTree extends WorldGenAbstractTree {
-
 	private static final IBlockState field_181643_a = Blocks.log2.getDefaultState().withProperty(BlockNewLog.VARIANT,
 			BlockPlanks.EnumType.ACACIA);
 	private static final IBlockState field_181644_b = Blocks.leaves2.getDefaultState()
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenShrub.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenShrub.java
index 9b0caeb..a735b8f 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenShrub.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenShrub.java
@@ -7,7 +7,6 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenTrees;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -30,7 +29,6 @@ import net.minecraft.world.gen.feature.WorldGenTrees;
  * 
  */
 public class WorldGenShrub extends WorldGenTrees {
-
 	private final IBlockState leavesMetadata;
 	private final IBlockState woodMetadata;
 
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenSpikes.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenSpikes.java
index bb65b23..4b14dd9 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenSpikes.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenSpikes.java
@@ -6,7 +6,6 @@ import net.minecraft.entity.item.EntityEnderCrystal;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -29,7 +28,6 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public class WorldGenSpikes extends WorldGenerator {
-
 	private Block baseBlockRequired;
 
 	public WorldGenSpikes(Block parBlock) {
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenSwamp.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenSwamp.java
index 2db68d8..4a2657a 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenSwamp.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenSwamp.java
@@ -12,7 +12,6 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -35,7 +34,6 @@ import net.minecraft.world.gen.feature.WorldGenAbstractTree;
  * 
  */
 public class WorldGenSwamp extends WorldGenAbstractTree {
-
 	private static final IBlockState field_181648_a = Blocks.log.getDefaultState().withProperty(BlockOldLog.VARIANT,
 			BlockPlanks.EnumType.OAK);
 	private static final IBlockState field_181649_b = Blocks.leaves.getDefaultState()
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenTaiga1.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenTaiga1.java
index e81c2c3..cfac51e 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenTaiga1.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenTaiga1.java
@@ -11,7 +11,6 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -34,7 +33,6 @@ import net.minecraft.world.gen.feature.WorldGenAbstractTree;
  * 
  */
 public class WorldGenTaiga1 extends WorldGenAbstractTree {
-
 	private static final IBlockState field_181636_a = Blocks.log.getDefaultState().withProperty(BlockOldLog.VARIANT,
 			BlockPlanks.EnumType.SPRUCE);
 	private static final IBlockState field_181637_b = Blocks.leaves.getDefaultState()
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenTaiga2.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenTaiga2.java
index c4a4e35..cb48624 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenTaiga2.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenTaiga2.java
@@ -11,7 +11,6 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -34,7 +33,6 @@ import net.minecraft.world.gen.feature.WorldGenAbstractTree;
  * 
  */
 public class WorldGenTaiga2 extends WorldGenAbstractTree {
-
 	private static final IBlockState field_181645_a = Blocks.log.getDefaultState().withProperty(BlockOldLog.VARIANT,
 			BlockPlanks.EnumType.SPRUCE);
 	private static final IBlockState field_181646_b = Blocks.leaves.getDefaultState()
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenTallGrass.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenTallGrass.java
index a4540a3..8b382c7 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenTallGrass.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenTallGrass.java
@@ -8,7 +8,6 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -31,7 +30,6 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public class WorldGenTallGrass extends WorldGenerator {
-
 	private final IBlockState tallGrassState;
 
 	public WorldGenTallGrass(BlockTallGrass.EnumType parEnumType) {
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenTrees.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenTrees.java
index 6db0782..2a17b21 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenTrees.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenTrees.java
@@ -15,7 +15,6 @@ import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -38,7 +37,6 @@ import net.minecraft.world.gen.feature.WorldGenAbstractTree;
  * 
  */
 public class WorldGenTrees extends WorldGenAbstractTree {
-
 	private static final IBlockState field_181653_a = Blocks.log.getDefaultState().withProperty(BlockOldLog.VARIANT,
 			BlockPlanks.EnumType.OAK);
 	private static final IBlockState field_181654_b = Blocks.leaves.getDefaultState()
@@ -189,7 +187,9 @@ public class WorldGenTrees extends WorldGenAbstractTree {
 
 						if (random.nextInt(5) == 0 && i > 5) {
 							for (int i3 = 0; i3 < 2; ++i3) {
-								for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) {
+								EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+								for (int m = 0; m < facings.length; ++m) {
+									EnumFacing enumfacing = facings[m];
 									if (random.nextInt(4 - i3) == 0) {
 										EnumFacing enumfacing1 = enumfacing.getOpposite();
 										this.func_181652_a(world, random.nextInt(3),
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenVines.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenVines.java
index 8e7396b..5271b37 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenVines.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenVines.java
@@ -7,7 +7,6 @@ import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -30,11 +29,12 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public class WorldGenVines extends WorldGenerator {
-
 	public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) {
 		for (; blockpos.getY() < 128; blockpos = blockpos.up()) {
 			if (world.isAirBlock(blockpos)) {
-				for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL.facings()) {
+				EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+				for (int i = 0; i < facings.length; ++i) {
+					EnumFacing enumfacing = facings[i];
 					if (Blocks.vine.canPlaceBlockOnSide(world, blockpos, enumfacing)) {
 						IBlockState iblockstate = Blocks.vine.getDefaultState()
 								.withProperty(BlockVine.NORTH, Boolean.valueOf(enumfacing == EnumFacing.NORTH))
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenWaterlily.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenWaterlily.java
index 98d6fee..d7d3a3d 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenWaterlily.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenWaterlily.java
@@ -4,7 +4,6 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -27,7 +26,6 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public class WorldGenWaterlily extends WorldGenerator {
-
 	public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) {
 		for (int i = 0; i < 10; ++i) {
 			int j = blockpos.getX() + random.nextInt(8) - random.nextInt(8);
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGenerator.java b/src/main/java/net/minecraft/world/gen/feature/WorldGenerator.java
index a75871d..e208a14 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGenerator.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGenerator.java
@@ -26,7 +26,6 @@ import net.minecraft.world.World;
  * 
  */
 public abstract class WorldGenerator {
-
 	private final boolean doBlockNotify;
 
 	public WorldGenerator() {
diff --git a/src/main/java/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.java b/src/main/java/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.java
index a511310..4cda84b 100755
--- a/src/main/java/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.java
+++ b/src/main/java/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.java
@@ -10,7 +10,6 @@ import net.minecraft.tileentity.TileEntityChest;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.WeightedRandomChestContent;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -33,7 +32,6 @@ import net.minecraft.world.gen.feature.WorldGenerator;
  * 
  */
 public class WorldGeneratorBonusChest extends WorldGenerator {
-
 	private final List<WeightedRandomChestContent> chestItems;
 	private final int itemsToGenerateInBonusChest;
 
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayer.java b/src/main/java/net/minecraft/world/gen/layer/GenLayer.java
index 18bd49d..d8a92a5 100755
--- a/src/main/java/net/minecraft/world/gen/layer/GenLayer.java
+++ b/src/main/java/net/minecraft/world/gen/layer/GenLayer.java
@@ -7,25 +7,6 @@ import net.minecraft.util.ReportedException;
 import net.minecraft.world.WorldType;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.ChunkProviderSettings;
-import net.minecraft.world.gen.layer.GenLayerAddIsland;
-import net.minecraft.world.gen.layer.GenLayerAddMushroomIsland;
-import net.minecraft.world.gen.layer.GenLayerAddSnow;
-import net.minecraft.world.gen.layer.GenLayerBiome;
-import net.minecraft.world.gen.layer.GenLayerBiomeEdge;
-import net.minecraft.world.gen.layer.GenLayerDeepOcean;
-import net.minecraft.world.gen.layer.GenLayerEdge;
-import net.minecraft.world.gen.layer.GenLayerFuzzyZoom;
-import net.minecraft.world.gen.layer.GenLayerHills;
-import net.minecraft.world.gen.layer.GenLayerIsland;
-import net.minecraft.world.gen.layer.GenLayerRareBiome;
-import net.minecraft.world.gen.layer.GenLayerRemoveTooMuchOcean;
-import net.minecraft.world.gen.layer.GenLayerRiver;
-import net.minecraft.world.gen.layer.GenLayerRiverInit;
-import net.minecraft.world.gen.layer.GenLayerRiverMix;
-import net.minecraft.world.gen.layer.GenLayerShore;
-import net.minecraft.world.gen.layer.GenLayerSmooth;
-import net.minecraft.world.gen.layer.GenLayerVoronoiZoom;
-import net.minecraft.world.gen.layer.GenLayerZoom;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -48,7 +29,6 @@ import net.minecraft.world.gen.layer.GenLayerZoom;
  * 
  */
 public abstract class GenLayer {
-
 	private long worldGenSeed;
 	protected GenLayer parent;
 	private long chunkSeed;
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerAddIsland.java b/src/main/java/net/minecraft/world/gen/layer/GenLayerAddIsland.java
index 588cfa9..a2f8ae2 100755
--- a/src/main/java/net/minecraft/world/gen/layer/GenLayerAddIsland.java
+++ b/src/main/java/net/minecraft/world/gen/layer/GenLayerAddIsland.java
@@ -1,8 +1,5 @@
 package net.minecraft.world.gen.layer;
 
-import net.minecraft.world.gen.layer.GenLayer;
-import net.minecraft.world.gen.layer.IntCache;
-
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
  * 
@@ -24,7 +21,6 @@ import net.minecraft.world.gen.layer.IntCache;
  * 
  */
 public class GenLayerAddIsland extends GenLayer {
-
 	public GenLayerAddIsland(long parLong1, GenLayer parGenLayer) {
 		super(parLong1);
 		this.parent = parGenLayer;
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerAddMushroomIsland.java b/src/main/java/net/minecraft/world/gen/layer/GenLayerAddMushroomIsland.java
index c4e0abe..e5b5e6f 100755
--- a/src/main/java/net/minecraft/world/gen/layer/GenLayerAddMushroomIsland.java
+++ b/src/main/java/net/minecraft/world/gen/layer/GenLayerAddMushroomIsland.java
@@ -1,8 +1,6 @@
 package net.minecraft.world.gen.layer;
 
 import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.gen.layer.GenLayer;
-import net.minecraft.world.gen.layer.IntCache;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -25,7 +23,6 @@ import net.minecraft.world.gen.layer.IntCache;
  * 
  */
 public class GenLayerAddMushroomIsland extends GenLayer {
-
 	public GenLayerAddMushroomIsland(long parLong1, GenLayer parGenLayer) {
 		super(parLong1);
 		this.parent = parGenLayer;
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerAddSnow.java b/src/main/java/net/minecraft/world/gen/layer/GenLayerAddSnow.java
index a020ef7..60db8b4 100755
--- a/src/main/java/net/minecraft/world/gen/layer/GenLayerAddSnow.java
+++ b/src/main/java/net/minecraft/world/gen/layer/GenLayerAddSnow.java
@@ -1,8 +1,5 @@
 package net.minecraft.world.gen.layer;
 
-import net.minecraft.world.gen.layer.GenLayer;
-import net.minecraft.world.gen.layer.IntCache;
-
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
  * 
@@ -24,7 +21,6 @@ import net.minecraft.world.gen.layer.IntCache;
  * 
  */
 public class GenLayerAddSnow extends GenLayer {
-
 	public GenLayerAddSnow(long parLong1, GenLayer parGenLayer) {
 		super(parLong1);
 		this.parent = parGenLayer;
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerBiome.java b/src/main/java/net/minecraft/world/gen/layer/GenLayerBiome.java
index 58a315e..bfa8bc5 100755
--- a/src/main/java/net/minecraft/world/gen/layer/GenLayerBiome.java
+++ b/src/main/java/net/minecraft/world/gen/layer/GenLayerBiome.java
@@ -3,8 +3,6 @@ package net.minecraft.world.gen.layer;
 import net.minecraft.world.WorldType;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.ChunkProviderSettings;
-import net.minecraft.world.gen.layer.GenLayer;
-import net.minecraft.world.gen.layer.IntCache;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -27,7 +25,6 @@ import net.minecraft.world.gen.layer.IntCache;
  * 
  */
 public class GenLayerBiome extends GenLayer {
-
 	private BiomeGenBase[] field_151623_c = new BiomeGenBase[] { BiomeGenBase.desert, BiomeGenBase.desert,
 			BiomeGenBase.desert, BiomeGenBase.savanna, BiomeGenBase.savanna, BiomeGenBase.plains };
 	private BiomeGenBase[] field_151621_d = new BiomeGenBase[] { BiomeGenBase.forest, BiomeGenBase.roofedForest,
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerBiomeEdge.java b/src/main/java/net/minecraft/world/gen/layer/GenLayerBiomeEdge.java
index c6f53c8..24f1701 100755
--- a/src/main/java/net/minecraft/world/gen/layer/GenLayerBiomeEdge.java
+++ b/src/main/java/net/minecraft/world/gen/layer/GenLayerBiomeEdge.java
@@ -1,8 +1,6 @@
 package net.minecraft.world.gen.layer;
 
 import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.gen.layer.GenLayer;
-import net.minecraft.world.gen.layer.IntCache;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -25,7 +23,6 @@ import net.minecraft.world.gen.layer.IntCache;
  * 
  */
 public class GenLayerBiomeEdge extends GenLayer {
-
 	public GenLayerBiomeEdge(long parLong1, GenLayer parGenLayer) {
 		super(parLong1);
 		this.parent = parGenLayer;
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerDeepOcean.java b/src/main/java/net/minecraft/world/gen/layer/GenLayerDeepOcean.java
index a4c9ebb..dabf0af 100755
--- a/src/main/java/net/minecraft/world/gen/layer/GenLayerDeepOcean.java
+++ b/src/main/java/net/minecraft/world/gen/layer/GenLayerDeepOcean.java
@@ -1,8 +1,6 @@
 package net.minecraft.world.gen.layer;
 
 import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.gen.layer.GenLayer;
-import net.minecraft.world.gen.layer.IntCache;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -25,7 +23,6 @@ import net.minecraft.world.gen.layer.IntCache;
  * 
  */
 public class GenLayerDeepOcean extends GenLayer {
-
 	public GenLayerDeepOcean(long parLong1, GenLayer parGenLayer) {
 		super(parLong1);
 		this.parent = parGenLayer;
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerEdge.java b/src/main/java/net/minecraft/world/gen/layer/GenLayerEdge.java
index 3497ab1..928d51e 100755
--- a/src/main/java/net/minecraft/world/gen/layer/GenLayerEdge.java
+++ b/src/main/java/net/minecraft/world/gen/layer/GenLayerEdge.java
@@ -1,8 +1,5 @@
 package net.minecraft.world.gen.layer;
 
-import net.minecraft.world.gen.layer.GenLayer;
-import net.minecraft.world.gen.layer.IntCache;
-
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
  * 
@@ -24,7 +21,6 @@ import net.minecraft.world.gen.layer.IntCache;
  * 
  */
 public class GenLayerEdge extends GenLayer {
-
 	private final GenLayerEdge.Mode field_151627_c;
 
 	public GenLayerEdge(long parLong1, GenLayer parGenLayer, GenLayerEdge.Mode parMode) {
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerFuzzyZoom.java b/src/main/java/net/minecraft/world/gen/layer/GenLayerFuzzyZoom.java
index 792249f..2c52d91 100755
--- a/src/main/java/net/minecraft/world/gen/layer/GenLayerFuzzyZoom.java
+++ b/src/main/java/net/minecraft/world/gen/layer/GenLayerFuzzyZoom.java
@@ -1,8 +1,5 @@
 package net.minecraft.world.gen.layer;
 
-import net.minecraft.world.gen.layer.GenLayer;
-import net.minecraft.world.gen.layer.GenLayerZoom;
-
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
  * 
@@ -24,7 +21,6 @@ import net.minecraft.world.gen.layer.GenLayerZoom;
  * 
  */
 public class GenLayerFuzzyZoom extends GenLayerZoom {
-
 	public GenLayerFuzzyZoom(long parLong1, GenLayer parGenLayer) {
 		super(parLong1, parGenLayer);
 	}
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerHills.java b/src/main/java/net/minecraft/world/gen/layer/GenLayerHills.java
index 1f1ade6..eece564 100755
--- a/src/main/java/net/minecraft/world/gen/layer/GenLayerHills.java
+++ b/src/main/java/net/minecraft/world/gen/layer/GenLayerHills.java
@@ -1,8 +1,6 @@
 package net.minecraft.world.gen.layer;
 
 import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.gen.layer.GenLayer;
-import net.minecraft.world.gen.layer.IntCache;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
@@ -27,7 +25,6 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
  * 
  */
 public class GenLayerHills extends GenLayer {
-
 	private static final Logger logger = LogManager.getLogger();
 	private GenLayer field_151628_d;
 
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerIsland.java b/src/main/java/net/minecraft/world/gen/layer/GenLayerIsland.java
index 7d721d7..8477c75 100755
--- a/src/main/java/net/minecraft/world/gen/layer/GenLayerIsland.java
+++ b/src/main/java/net/minecraft/world/gen/layer/GenLayerIsland.java
@@ -1,8 +1,5 @@
 package net.minecraft.world.gen.layer;
 
-import net.minecraft.world.gen.layer.GenLayer;
-import net.minecraft.world.gen.layer.IntCache;
-
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
  * 
@@ -24,7 +21,6 @@ import net.minecraft.world.gen.layer.IntCache;
  * 
  */
 public class GenLayerIsland extends GenLayer {
-
 	public GenLayerIsland(long parLong1) {
 		super(parLong1);
 	}
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerRareBiome.java b/src/main/java/net/minecraft/world/gen/layer/GenLayerRareBiome.java
index cb4c14d..1bf7029 100755
--- a/src/main/java/net/minecraft/world/gen/layer/GenLayerRareBiome.java
+++ b/src/main/java/net/minecraft/world/gen/layer/GenLayerRareBiome.java
@@ -1,8 +1,6 @@
 package net.minecraft.world.gen.layer;
 
 import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.gen.layer.GenLayer;
-import net.minecraft.world.gen.layer.IntCache;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -25,7 +23,6 @@ import net.minecraft.world.gen.layer.IntCache;
  * 
  */
 public class GenLayerRareBiome extends GenLayer {
-
 	public GenLayerRareBiome(long parLong1, GenLayer parGenLayer) {
 		super(parLong1);
 		this.parent = parGenLayer;
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerRemoveTooMuchOcean.java b/src/main/java/net/minecraft/world/gen/layer/GenLayerRemoveTooMuchOcean.java
index f2053f2..2870d6b 100755
--- a/src/main/java/net/minecraft/world/gen/layer/GenLayerRemoveTooMuchOcean.java
+++ b/src/main/java/net/minecraft/world/gen/layer/GenLayerRemoveTooMuchOcean.java
@@ -1,8 +1,5 @@
 package net.minecraft.world.gen.layer;
 
-import net.minecraft.world.gen.layer.GenLayer;
-import net.minecraft.world.gen.layer.IntCache;
-
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
  * 
@@ -24,7 +21,6 @@ import net.minecraft.world.gen.layer.IntCache;
  * 
  */
 public class GenLayerRemoveTooMuchOcean extends GenLayer {
-
 	public GenLayerRemoveTooMuchOcean(long parLong1, GenLayer parGenLayer) {
 		super(parLong1);
 		this.parent = parGenLayer;
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerRiver.java b/src/main/java/net/minecraft/world/gen/layer/GenLayerRiver.java
index cfead43..2e262c4 100755
--- a/src/main/java/net/minecraft/world/gen/layer/GenLayerRiver.java
+++ b/src/main/java/net/minecraft/world/gen/layer/GenLayerRiver.java
@@ -1,8 +1,6 @@
 package net.minecraft.world.gen.layer;
 
 import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.gen.layer.GenLayer;
-import net.minecraft.world.gen.layer.IntCache;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -25,7 +23,6 @@ import net.minecraft.world.gen.layer.IntCache;
  * 
  */
 public class GenLayerRiver extends GenLayer {
-
 	public GenLayerRiver(long parLong1, GenLayer parGenLayer) {
 		super(parLong1);
 		super.parent = parGenLayer;
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerRiverInit.java b/src/main/java/net/minecraft/world/gen/layer/GenLayerRiverInit.java
index 62dc925..a7b466d 100755
--- a/src/main/java/net/minecraft/world/gen/layer/GenLayerRiverInit.java
+++ b/src/main/java/net/minecraft/world/gen/layer/GenLayerRiverInit.java
@@ -1,8 +1,5 @@
 package net.minecraft.world.gen.layer;
 
-import net.minecraft.world.gen.layer.GenLayer;
-import net.minecraft.world.gen.layer.IntCache;
-
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
  * 
@@ -24,7 +21,6 @@ import net.minecraft.world.gen.layer.IntCache;
  * 
  */
 public class GenLayerRiverInit extends GenLayer {
-
 	public GenLayerRiverInit(long parLong1, GenLayer parGenLayer) {
 		super(parLong1);
 		this.parent = parGenLayer;
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerRiverMix.java b/src/main/java/net/minecraft/world/gen/layer/GenLayerRiverMix.java
index 67153e6..5801f52 100755
--- a/src/main/java/net/minecraft/world/gen/layer/GenLayerRiverMix.java
+++ b/src/main/java/net/minecraft/world/gen/layer/GenLayerRiverMix.java
@@ -1,8 +1,6 @@
 package net.minecraft.world.gen.layer;
 
 import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.gen.layer.GenLayer;
-import net.minecraft.world.gen.layer.IntCache;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -25,7 +23,6 @@ import net.minecraft.world.gen.layer.IntCache;
  * 
  */
 public class GenLayerRiverMix extends GenLayer {
-
 	private GenLayer biomePatternGeneratorChain;
 	private GenLayer riverPatternGeneratorChain;
 
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerShore.java b/src/main/java/net/minecraft/world/gen/layer/GenLayerShore.java
index 109a049..a3363cc 100755
--- a/src/main/java/net/minecraft/world/gen/layer/GenLayerShore.java
+++ b/src/main/java/net/minecraft/world/gen/layer/GenLayerShore.java
@@ -3,8 +3,6 @@ package net.minecraft.world.gen.layer;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.biome.BiomeGenJungle;
 import net.minecraft.world.biome.BiomeGenMesa;
-import net.minecraft.world.gen.layer.GenLayer;
-import net.minecraft.world.gen.layer.IntCache;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -27,7 +25,6 @@ import net.minecraft.world.gen.layer.IntCache;
  * 
  */
 public class GenLayerShore extends GenLayer {
-
 	public GenLayerShore(long parLong1, GenLayer parGenLayer) {
 		super(parLong1);
 		this.parent = parGenLayer;
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerSmooth.java b/src/main/java/net/minecraft/world/gen/layer/GenLayerSmooth.java
index db48494..afbd8b9 100755
--- a/src/main/java/net/minecraft/world/gen/layer/GenLayerSmooth.java
+++ b/src/main/java/net/minecraft/world/gen/layer/GenLayerSmooth.java
@@ -1,8 +1,5 @@
 package net.minecraft.world.gen.layer;
 
-import net.minecraft.world.gen.layer.GenLayer;
-import net.minecraft.world.gen.layer.IntCache;
-
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
  * 
@@ -24,7 +21,6 @@ import net.minecraft.world.gen.layer.IntCache;
  * 
  */
 public class GenLayerSmooth extends GenLayer {
-
 	public GenLayerSmooth(long parLong1, GenLayer parGenLayer) {
 		super(parLong1);
 		super.parent = parGenLayer;
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerVoronoiZoom.java b/src/main/java/net/minecraft/world/gen/layer/GenLayerVoronoiZoom.java
index 92f8d74..e52bc81 100755
--- a/src/main/java/net/minecraft/world/gen/layer/GenLayerVoronoiZoom.java
+++ b/src/main/java/net/minecraft/world/gen/layer/GenLayerVoronoiZoom.java
@@ -1,8 +1,5 @@
 package net.minecraft.world.gen.layer;
 
-import net.minecraft.world.gen.layer.GenLayer;
-import net.minecraft.world.gen.layer.IntCache;
-
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
  * 
@@ -24,7 +21,6 @@ import net.minecraft.world.gen.layer.IntCache;
  * 
  */
 public class GenLayerVoronoiZoom extends GenLayer {
-
 	public GenLayerVoronoiZoom(long parLong1, GenLayer parGenLayer) {
 		super(parLong1);
 		super.parent = parGenLayer;
diff --git a/src/main/java/net/minecraft/world/gen/layer/GenLayerZoom.java b/src/main/java/net/minecraft/world/gen/layer/GenLayerZoom.java
index 4575697..bd7538e 100755
--- a/src/main/java/net/minecraft/world/gen/layer/GenLayerZoom.java
+++ b/src/main/java/net/minecraft/world/gen/layer/GenLayerZoom.java
@@ -1,8 +1,5 @@
 package net.minecraft.world.gen.layer;
 
-import net.minecraft.world.gen.layer.GenLayer;
-import net.minecraft.world.gen.layer.IntCache;
-
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
  * 
@@ -24,7 +21,6 @@ import net.minecraft.world.gen.layer.IntCache;
  * 
  */
 public class GenLayerZoom extends GenLayer {
-
 	public GenLayerZoom(long parLong1, GenLayer parGenLayer) {
 		super(parLong1);
 		super.parent = parGenLayer;
diff --git a/src/main/java/net/minecraft/world/gen/layer/IntCache.java b/src/main/java/net/minecraft/world/gen/layer/IntCache.java
index c4bdbc9..e17ed58 100755
--- a/src/main/java/net/minecraft/world/gen/layer/IntCache.java
+++ b/src/main/java/net/minecraft/world/gen/layer/IntCache.java
@@ -24,7 +24,6 @@ import java.util.List;
  * 
  */
 public class IntCache {
-
 	private static int intCacheSize = 256;
 	/**+
 	 * A list of pre-allocated int[256] arrays that are currently
diff --git a/src/main/java/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.java b/src/main/java/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.java
index be5801e..aa0c8cf 100755
--- a/src/main/java/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.java
+++ b/src/main/java/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.java
@@ -21,9 +21,6 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.WeightedRandomChestContent;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.structure.MapGenStructureIO;
-import net.minecraft.world.gen.structure.StructureBoundingBox;
-import net.minecraft.world.gen.structure.StructureComponent;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -46,7 +43,6 @@ import net.minecraft.world.gen.structure.StructureComponent;
  * 
  */
 public class ComponentScatteredFeaturePieces {
-
 	public static void registerScatteredFeaturePieces() {
 		MapGenStructureIO.registerStructureComponent(ComponentScatteredFeaturePieces.DesertPyramid.class, "TeDP");
 		MapGenStructureIO.registerStructureComponent(ComponentScatteredFeaturePieces.JunglePyramid.class, "TeJP");
@@ -444,7 +440,9 @@ public class ComponentScatteredFeaturePieces {
 			this.setBlockState(world, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()),
 					10, -11, 13, structureboundingbox);
 
-			for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) {
+			EnumFacing[] facings = EnumFacing.Plane.HORIZONTAL.facingsArray;
+			for (int m = 0; m < facings.length; ++m) {
+				EnumFacing enumfacing = facings[m];
 				if (!this.field_74940_h[enumfacing.getHorizontalIndex()]) {
 					int k1 = enumfacing.getFrontOffsetX() * 2;
 					int l1 = enumfacing.getFrontOffsetZ() * 2;
diff --git a/src/main/java/net/minecraft/world/gen/structure/MapGenMineshaft.java b/src/main/java/net/minecraft/world/gen/structure/MapGenMineshaft.java
index 5776eda..005cb2f 100755
--- a/src/main/java/net/minecraft/world/gen/structure/MapGenMineshaft.java
+++ b/src/main/java/net/minecraft/world/gen/structure/MapGenMineshaft.java
@@ -3,9 +3,6 @@ package net.minecraft.world.gen.structure;
 import java.util.Map;
 import java.util.Map.Entry;
 import net.minecraft.util.MathHelper;
-import net.minecraft.world.gen.structure.MapGenStructure;
-import net.minecraft.world.gen.structure.StructureMineshaftStart;
-import net.minecraft.world.gen.structure.StructureStart;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -28,7 +25,6 @@ import net.minecraft.world.gen.structure.StructureStart;
  * 
  */
 public class MapGenMineshaft extends MapGenStructure {
-
 	private double field_82673_e = 0.004D;
 
 	public MapGenMineshaft() {
diff --git a/src/main/java/net/minecraft/world/gen/structure/MapGenNetherBridge.java b/src/main/java/net/minecraft/world/gen/structure/MapGenNetherBridge.java
index 6b447c8..47566d1 100755
--- a/src/main/java/net/minecraft/world/gen/structure/MapGenNetherBridge.java
+++ b/src/main/java/net/minecraft/world/gen/structure/MapGenNetherBridge.java
@@ -9,10 +9,6 @@ import net.minecraft.entity.monster.EntityPigZombie;
 import net.minecraft.entity.monster.EntitySkeleton;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.gen.structure.MapGenStructure;
-import net.minecraft.world.gen.structure.StructureComponent;
-import net.minecraft.world.gen.structure.StructureNetherBridgePieces;
-import net.minecraft.world.gen.structure.StructureStart;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -35,7 +31,6 @@ import net.minecraft.world.gen.structure.StructureStart;
  * 
  */
 public class MapGenNetherBridge extends MapGenStructure {
-
 	private List<BiomeGenBase.SpawnListEntry> spawnList = Lists.newArrayList();
 
 	public MapGenNetherBridge() {
diff --git a/src/main/java/net/minecraft/world/gen/structure/MapGenScatteredFeature.java b/src/main/java/net/minecraft/world/gen/structure/MapGenScatteredFeature.java
index 944b858..df7068d 100755
--- a/src/main/java/net/minecraft/world/gen/structure/MapGenScatteredFeature.java
+++ b/src/main/java/net/minecraft/world/gen/structure/MapGenScatteredFeature.java
@@ -11,10 +11,6 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.gen.structure.ComponentScatteredFeaturePieces;
-import net.minecraft.world.gen.structure.MapGenStructure;
-import net.minecraft.world.gen.structure.StructureComponent;
-import net.minecraft.world.gen.structure.StructureStart;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -37,7 +33,6 @@ import net.minecraft.world.gen.structure.StructureStart;
  * 
  */
 public class MapGenScatteredFeature extends MapGenStructure {
-
 	private static final List<BiomeGenBase> biomelist = Arrays.asList(new BiomeGenBase[] { BiomeGenBase.desert,
 			BiomeGenBase.desertHills, BiomeGenBase.jungle, BiomeGenBase.jungleHills, BiomeGenBase.swampland });
 	private List<BiomeGenBase.SpawnListEntry> scatteredFeatureSpawnList;
@@ -93,8 +88,8 @@ public class MapGenScatteredFeature extends MapGenStructure {
 				return false;
 			}
 
-			for (BiomeGenBase biomegenbase1 : biomelist) {
-				if (biomegenbase == biomegenbase1) {
+			for (int m = 0, n = biomelist.size(); m < n; ++m) {
+				if (biomegenbase == biomelist.get(m)) {
 					return true;
 				}
 			}
diff --git a/src/main/java/net/minecraft/world/gen/structure/MapGenStronghold.java b/src/main/java/net/minecraft/world/gen/structure/MapGenStronghold.java
index b4ff6e7..738895f 100755
--- a/src/main/java/net/minecraft/world/gen/structure/MapGenStronghold.java
+++ b/src/main/java/net/minecraft/world/gen/structure/MapGenStronghold.java
@@ -11,10 +11,6 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.world.ChunkCoordIntPair;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.gen.structure.MapGenStructure;
-import net.minecraft.world.gen.structure.StructureComponent;
-import net.minecraft.world.gen.structure.StructureStart;
-import net.minecraft.world.gen.structure.StructureStrongholdPieces;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -37,7 +33,6 @@ import net.minecraft.world.gen.structure.StructureStrongholdPieces;
  * 
  */
 public class MapGenStronghold extends MapGenStructure {
-
 	private List<BiomeGenBase> field_151546_e;
 	private boolean ranBiomeCheck;
 	private ChunkCoordIntPair[] structureCoords;
@@ -50,7 +45,9 @@ public class MapGenStronghold extends MapGenStructure {
 		this.field_82672_i = 3;
 		this.field_151546_e = Lists.newArrayList();
 
-		for (BiomeGenBase biomegenbase : BiomeGenBase.getBiomeGenArray()) {
+		BiomeGenBase[] biomes = BiomeGenBase.getBiomeGenArray();
+		for (int i = 0; i < biomes.length; ++i) {
+			BiomeGenBase biomegenbase = biomes[i];
 			if (biomegenbase != null && biomegenbase.minHeight > 0.0F) {
 				this.field_151546_e.add(biomegenbase);
 			}
@@ -109,7 +106,8 @@ public class MapGenStronghold extends MapGenStructure {
 			this.ranBiomeCheck = true;
 		}
 
-		for (ChunkCoordIntPair chunkcoordintpair : this.structureCoords) {
+		for (int l = 0; l < this.structureCoords.length; ++l) {
+			ChunkCoordIntPair chunkcoordintpair = this.structureCoords[l];
 			if (i == chunkcoordintpair.chunkXPos && j == chunkcoordintpair.chunkZPos) {
 				return true;
 			}
@@ -126,7 +124,8 @@ public class MapGenStronghold extends MapGenStructure {
 	protected List<BlockPos> getCoordList() {
 		ArrayList arraylist = Lists.newArrayList();
 
-		for (ChunkCoordIntPair chunkcoordintpair : this.structureCoords) {
+		for (int l = 0; l < this.structureCoords.length; ++l) {
+			ChunkCoordIntPair chunkcoordintpair = this.structureCoords[l];
 			if (chunkcoordintpair != null) {
 				arraylist.add(chunkcoordintpair.getCenterBlock(64));
 			}
diff --git a/src/main/java/net/minecraft/world/gen/structure/MapGenStructure.java b/src/main/java/net/minecraft/world/gen/structure/MapGenStructure.java
index 5ab7f95..7af22b3 100755
--- a/src/main/java/net/minecraft/world/gen/structure/MapGenStructure.java
+++ b/src/main/java/net/minecraft/world/gen/structure/MapGenStructure.java
@@ -13,18 +13,12 @@ import net.minecraft.crash.CrashReport;
 import net.minecraft.crash.CrashReportCategory;
 import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.ReportedException;
 import net.minecraft.world.ChunkCoordIntPair;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.ChunkPrimer;
 import net.minecraft.world.gen.MapGenBase;
-import net.minecraft.world.gen.structure.MapGenStructureData;
-import net.minecraft.world.gen.structure.MapGenStructureIO;
-import net.minecraft.world.gen.structure.StructureBoundingBox;
-import net.minecraft.world.gen.structure.StructureComponent;
-import net.minecraft.world.gen.structure.StructureStart;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -47,7 +41,6 @@ import net.minecraft.world.gen.structure.StructureStart;
  * 
  */
 public abstract class MapGenStructure extends MapGenBase {
-
 	private MapGenStructureData structureData;
 	protected Map<Long, StructureStart> structureMap = Maps.newHashMap();
 
@@ -182,11 +175,12 @@ public abstract class MapGenStructure extends MapGenBase {
 		if (blockpos != null) {
 			return blockpos;
 		} else {
-			List list = this.getCoordList();
+			List<BlockPos> list = this.getCoordList();
 			if (list != null) {
 				BlockPos blockpos2 = null;
 
-				for (BlockPos blockpos3 : (List<BlockPos>) list) {
+				for (int m = 0, n = list.size(); m < n; ++m) {
+					BlockPos blockpos3 = list.get(m);
 					double d2 = blockpos3.distanceSq(pos);
 					if (d2 < d0) {
 						d0 = d2;
diff --git a/src/main/java/net/minecraft/world/gen/structure/MapGenStructureData.java b/src/main/java/net/minecraft/world/gen/structure/MapGenStructureData.java
index cf8a44a..07e3b0c 100755
--- a/src/main/java/net/minecraft/world/gen/structure/MapGenStructureData.java
+++ b/src/main/java/net/minecraft/world/gen/structure/MapGenStructureData.java
@@ -24,7 +24,6 @@ import net.minecraft.world.WorldSavedData;
  * 
  */
 public class MapGenStructureData extends WorldSavedData {
-
 	private NBTTagCompound tagCompound = new NBTTagCompound();
 
 	public MapGenStructureData(String name) {
diff --git a/src/main/java/net/minecraft/world/gen/structure/MapGenStructureIO.java b/src/main/java/net/minecraft/world/gen/structure/MapGenStructureIO.java
index 73efc3e..832f5d2 100755
--- a/src/main/java/net/minecraft/world/gen/structure/MapGenStructureIO.java
+++ b/src/main/java/net/minecraft/world/gen/structure/MapGenStructureIO.java
@@ -4,20 +4,6 @@ import com.google.common.collect.Maps;
 import java.util.Map;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.structure.ComponentScatteredFeaturePieces;
-import net.minecraft.world.gen.structure.MapGenNetherBridge;
-import net.minecraft.world.gen.structure.MapGenScatteredFeature;
-import net.minecraft.world.gen.structure.MapGenStronghold;
-import net.minecraft.world.gen.structure.MapGenVillage;
-import net.minecraft.world.gen.structure.StructureComponent;
-import net.minecraft.world.gen.structure.StructureMineshaftPieces;
-import net.minecraft.world.gen.structure.StructureMineshaftStart;
-import net.minecraft.world.gen.structure.StructureNetherBridgePieces;
-import net.minecraft.world.gen.structure.StructureOceanMonument;
-import net.minecraft.world.gen.structure.StructureOceanMonumentPieces;
-import net.minecraft.world.gen.structure.StructureStart;
-import net.minecraft.world.gen.structure.StructureStrongholdPieces;
-import net.minecraft.world.gen.structure.StructureVillagePieces;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
 
@@ -42,7 +28,6 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
  * 
  */
 public class MapGenStructureIO {
-
 	private static final Logger logger = LogManager.getLogger();
 	private static Map<String, Class<? extends StructureStart>> startNameToClassMap = Maps.newHashMap();
 	private static Map<Class<? extends StructureStart>, String> startClassToNameMap = Maps.newHashMap();
diff --git a/src/main/java/net/minecraft/world/gen/structure/MapGenVillage.java b/src/main/java/net/minecraft/world/gen/structure/MapGenVillage.java
index a17c12b..5547ee7 100755
--- a/src/main/java/net/minecraft/world/gen/structure/MapGenVillage.java
+++ b/src/main/java/net/minecraft/world/gen/structure/MapGenVillage.java
@@ -9,10 +9,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.gen.structure.MapGenStructure;
-import net.minecraft.world.gen.structure.StructureComponent;
-import net.minecraft.world.gen.structure.StructureStart;
-import net.minecraft.world.gen.structure.StructureVillagePieces;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -35,7 +31,6 @@ import net.minecraft.world.gen.structure.StructureVillagePieces;
  * 
  */
 public class MapGenVillage extends MapGenStructure {
-
 	/**+
 	 * A list of all the biomes villages can spawn in.
 	 */
diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureBoundingBox.java b/src/main/java/net/minecraft/world/gen/structure/StructureBoundingBox.java
index 1d836c1..eb14fc2 100755
--- a/src/main/java/net/minecraft/world/gen/structure/StructureBoundingBox.java
+++ b/src/main/java/net/minecraft/world/gen/structure/StructureBoundingBox.java
@@ -27,7 +27,6 @@ import net.minecraft.util.Vec3i;
  * 
  */
 public class StructureBoundingBox {
-
 	public int minX;
 	public int minY;
 	public int minZ;
diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureComponent.java b/src/main/java/net/minecraft/world/gen/structure/StructureComponent.java
index 3cdb30d..0a525e8 100755
--- a/src/main/java/net/minecraft/world/gen/structure/StructureComponent.java
+++ b/src/main/java/net/minecraft/world/gen/structure/StructureComponent.java
@@ -17,8 +17,6 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.WeightedRandomChestContent;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.structure.MapGenStructureIO;
-import net.minecraft.world.gen.structure.StructureBoundingBox;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -41,7 +39,6 @@ import net.minecraft.world.gen.structure.StructureBoundingBox;
  * 
  */
 public abstract class StructureComponent {
-
 	protected StructureBoundingBox boundingBox;
 	protected EnumFacing coordBaseMode;
 	protected int componentType;
diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureMineshaftPieces.java b/src/main/java/net/minecraft/world/gen/structure/StructureMineshaftPieces.java
index 4db3e4b..9fc91ef 100755
--- a/src/main/java/net/minecraft/world/gen/structure/StructureMineshaftPieces.java
+++ b/src/main/java/net/minecraft/world/gen/structure/StructureMineshaftPieces.java
@@ -18,9 +18,6 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.WeightedRandomChestContent;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.structure.MapGenStructureIO;
-import net.minecraft.world.gen.structure.StructureBoundingBox;
-import net.minecraft.world.gen.structure.StructureComponent;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -43,7 +40,6 @@ import net.minecraft.world.gen.structure.StructureComponent;
  * 
  */
 public class StructureMineshaftPieces {
-
 	private static final List<WeightedRandomChestContent> CHEST_CONTENT_WEIGHT_LIST = Lists.newArrayList(
 			new WeightedRandomChestContent[] { new WeightedRandomChestContent(Items.iron_ingot, 0, 1, 5, 10),
 					new WeightedRandomChestContent(Items.gold_ingot, 0, 1, 3, 5),
diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureMineshaftStart.java b/src/main/java/net/minecraft/world/gen/structure/StructureMineshaftStart.java
index 3ba7f36..13fcb8a 100755
--- a/src/main/java/net/minecraft/world/gen/structure/StructureMineshaftStart.java
+++ b/src/main/java/net/minecraft/world/gen/structure/StructureMineshaftStart.java
@@ -2,8 +2,6 @@ package net.minecraft.world.gen.structure;
 
 import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.structure.StructureMineshaftPieces;
-import net.minecraft.world.gen.structure.StructureStart;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -26,7 +24,6 @@ import net.minecraft.world.gen.structure.StructureStart;
  * 
  */
 public class StructureMineshaftStart extends StructureStart {
-
 	public StructureMineshaftStart() {
 	}
 
diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureNetherBridgePieces.java b/src/main/java/net/minecraft/world/gen/structure/StructureNetherBridgePieces.java
index da87d72..9e00cbe 100755
--- a/src/main/java/net/minecraft/world/gen/structure/StructureNetherBridgePieces.java
+++ b/src/main/java/net/minecraft/world/gen/structure/StructureNetherBridgePieces.java
@@ -13,9 +13,6 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.WeightedRandomChestContent;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.structure.MapGenStructureIO;
-import net.minecraft.world.gen.structure.StructureBoundingBox;
-import net.minecraft.world.gen.structure.StructureComponent;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -38,7 +35,6 @@ import net.minecraft.world.gen.structure.StructureComponent;
  * 
  */
 public class StructureNetherBridgePieces {
-
 	private static final StructureNetherBridgePieces.PieceWeight[] primaryComponents = new StructureNetherBridgePieces.PieceWeight[] {
 			new StructureNetherBridgePieces.PieceWeight(StructureNetherBridgePieces.Straight.class, 30, 0, true),
 			new StructureNetherBridgePieces.PieceWeight(StructureNetherBridgePieces.Crossing3.class, 10, 4),
diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureOceanMonument.java b/src/main/java/net/minecraft/world/gen/structure/StructureOceanMonument.java
index c8c6911..e1c754b 100755
--- a/src/main/java/net/minecraft/world/gen/structure/StructureOceanMonument.java
+++ b/src/main/java/net/minecraft/world/gen/structure/StructureOceanMonument.java
@@ -17,10 +17,6 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.world.ChunkCoordIntPair;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.gen.structure.MapGenStructure;
-import net.minecraft.world.gen.structure.StructureBoundingBox;
-import net.minecraft.world.gen.structure.StructureOceanMonumentPieces;
-import net.minecraft.world.gen.structure.StructureStart;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -43,7 +39,6 @@ import net.minecraft.world.gen.structure.StructureStart;
  * 
  */
 public class StructureOceanMonument extends MapGenStructure {
-
 	private int field_175800_f;
 	private int field_175801_g;
 	public static final List<BiomeGenBase> field_175802_d = Arrays.asList(new BiomeGenBase[] { BiomeGenBase.ocean,
diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureOceanMonumentPieces.java b/src/main/java/net/minecraft/world/gen/structure/StructureOceanMonumentPieces.java
index 013d158..a18fbff 100755
--- a/src/main/java/net/minecraft/world/gen/structure/StructureOceanMonumentPieces.java
+++ b/src/main/java/net/minecraft/world/gen/structure/StructureOceanMonumentPieces.java
@@ -2,7 +2,6 @@ package net.minecraft.world.gen.structure;
 
 import com.google.common.collect.Lists;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
@@ -18,9 +17,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.structure.MapGenStructureIO;
-import net.minecraft.world.gen.structure.StructureBoundingBox;
-import net.minecraft.world.gen.structure.StructureComponent;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -43,7 +39,6 @@ import net.minecraft.world.gen.structure.StructureComponent;
  * 
  */
 public class StructureOceanMonumentPieces {
-
 	public static void registerOceanMonumentPieces() {
 		MapGenStructureIO.registerStructureComponent(StructureOceanMonumentPieces.MonumentBuilding.class, "OMB");
 		MapGenStructureIO.registerStructureComponent(StructureOceanMonumentPieces.MonumentCoreRoom.class, "OMCR");
@@ -777,7 +772,7 @@ public class StructureOceanMonumentPieces {
 					for (int j3 = 0; j3 < 3; ++j3) {
 						int i4 = func_175820_a(j2, j3, i3);
 						if (astructureoceanmonumentpieces$roomdefinition[i4] != null) {
-							for (EnumFacing enumfacing : EnumFacing.values()) {
+							for (EnumFacing enumfacing : EnumFacing._VALUES) {
 								int l = j2 + enumfacing.getFrontOffsetX();
 								int i1 = j3 + enumfacing.getFrontOffsetY();
 								int j1 = i3 + enumfacing.getFrontOffsetZ();
diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureStart.java b/src/main/java/net/minecraft/world/gen/structure/StructureStart.java
index eccc1e1..fedaef1 100755
--- a/src/main/java/net/minecraft/world/gen/structure/StructureStart.java
+++ b/src/main/java/net/minecraft/world/gen/structure/StructureStart.java
@@ -7,9 +7,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.world.ChunkCoordIntPair;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.structure.MapGenStructureIO;
-import net.minecraft.world.gen.structure.StructureBoundingBox;
-import net.minecraft.world.gen.structure.StructureComponent;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -32,7 +29,6 @@ import net.minecraft.world.gen.structure.StructureComponent;
  * 
  */
 public abstract class StructureStart {
-
 	/**+
 	 * List of all StructureComponents that are part of this
 	 * structure
diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureStrongholdPieces.java b/src/main/java/net/minecraft/world/gen/structure/StructureStrongholdPieces.java
index 8b885aa..beb2e88 100755
--- a/src/main/java/net/minecraft/world/gen/structure/StructureStrongholdPieces.java
+++ b/src/main/java/net/minecraft/world/gen/structure/StructureStrongholdPieces.java
@@ -16,9 +16,6 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.WeightedRandomChestContent;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.structure.MapGenStructureIO;
-import net.minecraft.world.gen.structure.StructureBoundingBox;
-import net.minecraft.world.gen.structure.StructureComponent;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -41,7 +38,6 @@ import net.minecraft.world.gen.structure.StructureComponent;
  * 
  */
 public class StructureStrongholdPieces {
-
 	private static final StructureStrongholdPieces.PieceWeight[] pieceWeightArray = new StructureStrongholdPieces.PieceWeight[] {
 			new StructureStrongholdPieces.PieceWeight(StructureStrongholdPieces.Straight.class, 40, 0),
 			new StructureStrongholdPieces.PieceWeight(StructureStrongholdPieces.Prison.class, 5, 5),
diff --git a/src/main/java/net/minecraft/world/gen/structure/StructureVillagePieces.java b/src/main/java/net/minecraft/world/gen/structure/StructureVillagePieces.java
index 71f241f..ffdb26e 100755
--- a/src/main/java/net/minecraft/world/gen/structure/StructureVillagePieces.java
+++ b/src/main/java/net/minecraft/world/gen/structure/StructureVillagePieces.java
@@ -25,10 +25,6 @@ import net.minecraft.util.WeightedRandomChestContent;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.biome.WorldChunkManager;
-import net.minecraft.world.gen.structure.MapGenStructureIO;
-import net.minecraft.world.gen.structure.MapGenVillage;
-import net.minecraft.world.gen.structure.StructureBoundingBox;
-import net.minecraft.world.gen.structure.StructureComponent;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -51,7 +47,6 @@ import net.minecraft.world.gen.structure.StructureComponent;
  * 
  */
 public class StructureVillagePieces {
-
 	public static void registerVillagePieces() {
 		MapGenStructureIO.registerStructureComponent(StructureVillagePieces.House1.class, "ViBH");
 		MapGenStructureIO.registerStructureComponent(StructureVillagePieces.Field1.class, "ViDF");
diff --git a/src/main/java/net/minecraft/world/pathfinder/NodeProcessor.java b/src/main/java/net/minecraft/world/pathfinder/NodeProcessor.java
index f488d0e..9b595c9 100755
--- a/src/main/java/net/minecraft/world/pathfinder/NodeProcessor.java
+++ b/src/main/java/net/minecraft/world/pathfinder/NodeProcessor.java
@@ -27,7 +27,6 @@ import net.minecraft.world.IBlockAccess;
  * 
  */
 public abstract class NodeProcessor {
-
 	protected IBlockAccess blockaccess;
 	protected IntHashMap<PathPoint> pointMap = new IntHashMap();
 	protected int entitySizeX;
diff --git a/src/main/java/net/minecraft/world/pathfinder/SwimNodeProcessor.java b/src/main/java/net/minecraft/world/pathfinder/SwimNodeProcessor.java
index 1f26752..a255804 100755
--- a/src/main/java/net/minecraft/world/pathfinder/SwimNodeProcessor.java
+++ b/src/main/java/net/minecraft/world/pathfinder/SwimNodeProcessor.java
@@ -8,7 +8,6 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.pathfinder.NodeProcessor;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -31,7 +30,6 @@ import net.minecraft.world.pathfinder.NodeProcessor;
  * 
  */
 public class SwimNodeProcessor extends NodeProcessor {
-
 	public void initProcessor(IBlockAccess iblockaccess, Entity entity) {
 		super.initProcessor(iblockaccess, entity);
 	}
@@ -69,7 +67,9 @@ public class SwimNodeProcessor extends NodeProcessor {
 			float f) {
 		int i = 0;
 
-		for (EnumFacing enumfacing : EnumFacing.values()) {
+		EnumFacing[] facings = EnumFacing._VALUES;
+		for (int j = 0; j < facings.length; ++j) {
+			EnumFacing enumfacing = facings[j];
 			PathPoint pathpoint2 = this.getSafePoint(entity, pathpoint.xCoord + enumfacing.getFrontOffsetX(),
 					pathpoint.yCoord + enumfacing.getFrontOffsetY(), pathpoint.zCoord + enumfacing.getFrontOffsetZ());
 			if (pathpoint2 != null && !pathpoint2.visited && pathpoint2.distanceTo(pathpoint1) < f) {
diff --git a/src/main/java/net/minecraft/world/pathfinder/WalkNodeProcessor.java b/src/main/java/net/minecraft/world/pathfinder/WalkNodeProcessor.java
index b7d623a..8681264 100755
--- a/src/main/java/net/minecraft/world/pathfinder/WalkNodeProcessor.java
+++ b/src/main/java/net/minecraft/world/pathfinder/WalkNodeProcessor.java
@@ -13,7 +13,6 @@ import net.minecraft.pathfinding.PathPoint;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.pathfinder.NodeProcessor;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -36,7 +35,6 @@ import net.minecraft.world.pathfinder.NodeProcessor;
  * 
  */
 public class WalkNodeProcessor extends NodeProcessor {
-
 	private boolean canEnterDoors;
 	private boolean canBreakDoors;
 	private boolean avoidsWater;
diff --git a/src/main/java/net/minecraft/world/storage/DerivedWorldInfo.java b/src/main/java/net/minecraft/world/storage/DerivedWorldInfo.java
index f6a47c2..24e50ae 100755
--- a/src/main/java/net/minecraft/world/storage/DerivedWorldInfo.java
+++ b/src/main/java/net/minecraft/world/storage/DerivedWorldInfo.java
@@ -6,7 +6,6 @@ import net.minecraft.world.EnumDifficulty;
 import net.minecraft.world.GameRules;
 import net.minecraft.world.WorldSettings;
 import net.minecraft.world.WorldType;
-import net.minecraft.world.storage.WorldInfo;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@@ -29,7 +28,6 @@ import net.minecraft.world.storage.WorldInfo;
  * 
  */
 public class DerivedWorldInfo extends WorldInfo {
-
 	private final WorldInfo theWorldInfo;
 
 	public DerivedWorldInfo(WorldInfo parWorldInfo) {
diff --git a/src/main/java/net/minecraft/world/storage/ISaveFormat.java b/src/main/java/net/minecraft/world/storage/ISaveFormat.java
index 859f9dd..b0fff08 100755
--- a/src/main/java/net/minecraft/world/storage/ISaveFormat.java
+++ b/src/main/java/net/minecraft/world/storage/ISaveFormat.java
@@ -2,9 +2,6 @@ package net.minecraft.world.storage;
 
 import java.util.List;
 import net.minecraft.util.IProgressUpdate;
-import net.minecraft.world.storage.ISaveHandler;
-import net.minecraft.world.storage.SaveFormatComparator;
-import net.minecraft.world.storage.WorldInfo;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
diff --git a/src/main/java/net/minecraft/world/storage/ISaveHandler.java b/src/main/java/net/minecraft/world/storage/ISaveHandler.java
index c2e9beb..bf5c2cf 100755
--- a/src/main/java/net/minecraft/world/storage/ISaveHandler.java
+++ b/src/main/java/net/minecraft/world/storage/ISaveHandler.java
@@ -5,8 +5,6 @@ import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2;
 import net.minecraft.world.MinecraftException;
 import net.minecraft.world.WorldProvider;
 import net.minecraft.world.chunk.storage.IChunkLoader;
-import net.minecraft.world.storage.IPlayerFileData;
-import net.minecraft.world.storage.WorldInfo;
 
 /**+
  * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
diff --git a/src/main/java/net/minecraft/world/storage/MapData.java b/src/main/java/net/minecraft/world/storage/MapData.java
index 53553e2..8d82a62 100755
--- a/src/main/java/net/minecraft/world/storage/MapData.java
+++ b/src/main/java/net/minecraft/world/storage/MapData.java
@@ -223,8 +223,8 @@ public class MapData extends WorldSavedData {
 	public void updateMapData(int x, int y) {
 		super.markDirty();
 
-		for (MapData.MapInfo mapdata$mapinfo : this.playersArrayList) {
-			mapdata$mapinfo.update(x, y);
+		for (int i = 0, l = this.playersArrayList.size(); i < l; ++i) {
+			this.playersArrayList.get(i).update(x, y);
 		}
 
 	}
diff --git a/src/main/java/net/minecraft/world/storage/MapStorage.java b/src/main/java/net/minecraft/world/storage/MapStorage.java
index 5a1b61b..3f3a1d2 100755
--- a/src/main/java/net/minecraft/world/storage/MapStorage.java
+++ b/src/main/java/net/minecraft/world/storage/MapStorage.java
@@ -57,10 +57,10 @@ public class MapStorage {
 	public static final Map<Class<? extends WorldSavedData>, MapStorageProvider> storageProviders = new HashMap();
 
 	static {
-		storageProviders.put(MapData.class, (s) -> new MapData(s));
-		storageProviders.put(MapGenStructureData.class, (s) -> new MapGenStructureData(s));
-		storageProviders.put(ScoreboardSaveData.class, (s) -> new ScoreboardSaveData(s));
-		storageProviders.put(VillageCollection.class, (s) -> new VillageCollection(s));
+		storageProviders.put(MapData.class, MapData::new);
+		storageProviders.put(MapGenStructureData.class, MapGenStructureData::new);
+		storageProviders.put(ScoreboardSaveData.class, ScoreboardSaveData::new);
+		storageProviders.put(VillageCollection.class, VillageCollection::new);
 	}
 
 	public MapStorage(ISaveHandler saveHandlerIn) {
diff --git a/src/main/java/net/minecraft/world/storage/SaveFormatOld.java b/src/main/java/net/minecraft/world/storage/SaveFormatOld.java
index b675e73..d9623fb 100755
--- a/src/main/java/net/minecraft/world/storage/SaveFormatOld.java
+++ b/src/main/java/net/minecraft/world/storage/SaveFormatOld.java
@@ -10,11 +10,6 @@ import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
 import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerIntegratedServerWorker;
 import net.minecraft.util.IProgressUpdate;
-import net.minecraft.world.storage.ISaveFormat;
-import net.minecraft.world.storage.ISaveHandler;
-import net.minecraft.world.storage.SaveFormatComparator;
-import net.minecraft.world.storage.SaveHandler;
-import net.minecraft.world.storage.WorldInfo;
 import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
@@ -40,7 +35,6 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
  * 
  */
 public class SaveFormatOld implements ISaveFormat {
-
 	private static final Logger logger = LogManager.getLogger();
 	protected final VFile2 savesDirectory;
 
diff --git a/src/main/java/net/minecraft/world/storage/SaveHandler.java b/src/main/java/net/minecraft/world/storage/SaveHandler.java
index 99813e4..c0d1a5d 100755
--- a/src/main/java/net/minecraft/world/storage/SaveHandler.java
+++ b/src/main/java/net/minecraft/world/storage/SaveHandler.java
@@ -1,8 +1,5 @@
 package net.minecraft.world.storage;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.List;
@@ -14,10 +11,6 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.MinecraftException;
 import net.minecraft.world.WorldProvider;
 import net.minecraft.world.chunk.storage.IChunkLoader;
-import net.minecraft.world.storage.IPlayerFileData;
-import net.minecraft.world.storage.ISaveHandler;
-import net.minecraft.world.storage.WorldInfo;
-import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
@@ -43,7 +36,6 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
  * 
  */
 public class SaveHandler implements ISaveHandler, IPlayerFileData {
-
 	private static final Logger logger = LogManager.getLogger();
 	private final VFile2 worldDirectory;
 	private final VFile2 playersDirectory;
diff --git a/src/main/java/org/apache/commons/lang3/Validate.java b/src/main/java/org/apache/commons/lang3/Validate.java
index 613107a..fd672b1 100755
--- a/src/main/java/org/apache/commons/lang3/Validate.java
+++ b/src/main/java/org/apache/commons/lang3/Validate.java
@@ -19,7 +19,6 @@ package org.apache.commons.lang3;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Objects;
 import java.util.regex.Pattern;
 
 import net.lax1dude.eaglercraft.v1_8.HString;
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformApplication.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformApplication.java
index aae90c2..052ad22 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformApplication.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformApplication.java
@@ -88,7 +88,7 @@ public class PlatformApplication {
 		});
 	}
 	
-	@JSBody(params = { "cb" }, script = "if(!window.navigator.clipboard) cb(\"\"); else window.navigator.clipboard.readText().then(function(s) { cb(s); }, function(s) { cb(\"\"); });")
+	@JSBody(params = { "cb" }, script = "if(!window.navigator.clipboard || !window.navigator.clipboard.readText) cb(\"\"); else window.navigator.clipboard.readText().then(function(s) { cb(s); }, function(s) { cb(\"\"); });")
 	private static native void getClipboard1(StupidFunctionResolveString cb);
 	
 	@JSBody(params = { "str" }, script = "if(window.navigator.clipboard) window.navigator.clipboard.writeText(str);")
@@ -248,7 +248,7 @@ public class PlatformApplication {
 		documentWrite(newWin.getDocument(), "<!DOCTYPE html><html><head><meta charset=\"UTF-8\" />"
 				+ "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\" /><title>EaglercraftX 1.8 Credits</title>"
 				+ "<link type=\"image/png\" rel=\"shortcut icon\" href=\"" + PlatformApplication.faviconURLTeaVM() + "\" />"
-						+ "</head><body><pre>" + text + "</pre></body></html>");
+						+ "</head><body><pre style=\"font:15px Consolas,monospace;\">" + text + "</pre></body></html>");
 	}
 
 	public static void clearFileChooserResult() {
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformFilesystem.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformFilesystem.java
index 801bc1b..2495556 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformFilesystem.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformFilesystem.java
@@ -22,9 +22,8 @@ import org.teavm.jso.typedarrays.DataView;
 
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.EaglerArrayBufferAllocator;
-import net.lax1dude.eaglercraft.v1_8.internal.vfs.BooleanResult;
+import net.lax1dude.eaglercraft.v1_8.internal.teavm.BooleanResult;
 import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFSIterator2;
-import net.lax1dude.eaglercraft.v1_8.sp.server.internal.ServerPlatformSingleplayer;
 
 /**
  * Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved.
@@ -46,17 +45,16 @@ public class PlatformFilesystem {
 	private static String filesystemDB = null;
 	private static IDBDatabase database = null;
 
-	public static void initialize() {
-		filesystemDB = "_net_lax1dude_eaglercraft_v1_8_internal_PlatformFilesystem_1_8_8_"
-				+ ServerPlatformSingleplayer.getClientConfigAdapter().getWorldsDB();
+	public static void initialize(String dbName) {
+		filesystemDB = "_net_lax1dude_eaglercraft_v1_8_internal_PlatformFilesystem_1_8_8_" + dbName;
 		DatabaseOpen dbOpen = AsyncHandlers.openDB(filesystemDB);
 		
 		if(dbOpen.failedLocked) {
-			throw new WorldsDatabaseLockedException(dbOpen.failedError);
+			throw new FilesystemDatabaseLockedException(dbOpen.failedError);
 		}
 		
 		if(dbOpen.failedInit) {
-			throw new WorldsDatabaseInitializationException(dbOpen.failedError);
+			throw new FilesystemDatabaseInitializationException(dbOpen.failedError);
 		}
 		
 		if(dbOpen.database == null) {
@@ -66,14 +64,14 @@ public class PlatformFilesystem {
 		database = dbOpen.database;
 	}
 
-	public static class WorldsDatabaseLockedException extends RuntimeException {
-		public WorldsDatabaseLockedException(String message) {
+	public static class FilesystemDatabaseLockedException extends RuntimeException {
+		public FilesystemDatabaseLockedException(String message) {
 			super(message);
 		}
 	}
 
-	public static class WorldsDatabaseInitializationException extends RuntimeException {
-		public WorldsDatabaseInitializationException(String message) {
+	public static class FilesystemDatabaseInitializationException extends RuntimeException {
+		public FilesystemDatabaseInitializationException(String message) {
 			super(message);
 		}
 	}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java
index f17a4ef..769a06f 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java
@@ -28,6 +28,8 @@ import org.teavm.jso.dom.html.HTMLCanvasElement;
 import org.teavm.jso.dom.html.HTMLDocument;
 import org.teavm.jso.dom.html.HTMLElement;
 import org.teavm.jso.typedarrays.ArrayBuffer;
+import org.teavm.jso.typedarrays.DataView;
+import org.teavm.jso.typedarrays.Uint8Array;
 import org.teavm.jso.webaudio.MediaStream;
 import org.teavm.jso.webgl.WebGLFramebuffer;
 
@@ -36,6 +38,7 @@ import com.jcraft.jzlib.GZIPInputStream;
 import com.jcraft.jzlib.GZIPOutputStream;
 import com.jcraft.jzlib.InflaterInputStream;
 
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformFilesystem.FilesystemDatabaseLockedException;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.ByteBuffer;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.EaglerArrayBufferAllocator;
 import net.lax1dude.eaglercraft.v1_8.internal.buffer.FloatBuffer;
@@ -51,6 +54,7 @@ import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMUtils;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.WebGL2RenderingContext;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerFolderResourcePack;
 import net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums;
 
 /**
@@ -168,6 +172,22 @@ public class PlatformRuntime {
 
 		byte[] finalLoadScreen = PlatformAssets.getResourceBytes("/assets/eagler/eagtek.png");
 
+		logger.info("Initializing filesystem...");
+
+		try {
+			PlatformFilesystem.initialize(getClientConfigAdapter().getResourcePacksDB());
+			EaglerFolderResourcePack.setSupported(true);
+		}catch(FilesystemDatabaseLockedException t) {
+			logger.error("Could not initialize filesystem, database is locked!");
+		}catch(Throwable t) {
+			logger.error("Could not initialize filesystem, encountered an exception!");
+			logger.error(t);
+		}
+
+		if(!EaglerFolderResourcePack.isSupported()) {
+			logger.error("Resource packs will be disabled for this session");
+		}
+
 		logger.info("Initializing sound engine...");
 
 		PlatformInput.pressAnyKeyScreen();
@@ -178,6 +198,8 @@ public class PlatformRuntime {
 			EarlyLoadScreen.paintFinal(finalLoadScreen);
 		}
 
+		EarlyLoadScreen.destroy();
+
 		logger.info("Platform initialization complete");
 
 		FixWebMDurationJS.checkOldScriptStillLoaded();
@@ -251,7 +273,31 @@ public class PlatformRuntime {
 	public static FloatBuffer allocateFloatBuffer(int length) {
 		return EaglerArrayBufferAllocator.allocateFloatBuffer(length);
 	}
-	
+
+	public static ByteBuffer castPrimitiveByteArray(byte[] array) {
+		return EaglerArrayBufferAllocator.wrapByteBufferTeaVM(DataView.create(TeaVMUtils.unwrapArrayBuffer(array)));
+	}
+
+	public static IntBuffer castPrimitiveIntArray(int[] array) {
+		return EaglerArrayBufferAllocator.wrapIntBufferTeaVM(DataView.create(TeaVMUtils.unwrapArrayBuffer(array)));
+	}
+
+	public static FloatBuffer castPrimitiveFloatArray(float[] array) {
+		return EaglerArrayBufferAllocator.wrapFloatBufferTeaVM(DataView.create(TeaVMUtils.unwrapArrayBuffer(array)));
+	}
+
+	public static byte[] castNativeByteBuffer(ByteBuffer buffer) {
+		return TeaVMUtils.wrapUnsignedByteArray(EaglerArrayBufferAllocator.getDataViewStupid(buffer));
+	}
+
+	public static int[] castNativeIntBuffer(IntBuffer buffer) {
+		return TeaVMUtils.wrapIntArray(EaglerArrayBufferAllocator.getDataViewStupid32(buffer));
+	}
+
+	public static float[] castNativeFloatBuffer(FloatBuffer buffer) {
+		return TeaVMUtils.wrapFloatArray(EaglerArrayBufferAllocator.getFloatArrayStupid(buffer));
+	}
+
 	public static void freeByteBuffer(ByteBuffer byteBuffer) {
 		
 	}
@@ -264,6 +310,10 @@ public class PlatformRuntime {
 		
 	}
 
+	public static void downloadRemoteURIByteArray(String assetPackageURI, final Consumer<byte[]> cb) {
+		downloadRemoteURI(assetPackageURI, arr -> cb.accept(TeaVMUtils.wrapUnsignedByteArray(Uint8Array.create(arr))));
+	}
+
 	public static void downloadRemoteURI(String assetPackageURI, final Consumer<ArrayBuffer> cb) {
 		downloadRemoteURI(assetPackageURI, false, cb);
 	}
@@ -331,7 +381,7 @@ public class PlatformRuntime {
 	public static native ArrayBuffer downloadRemoteURI(String assetPackageURI, boolean forceCache);
 
 	private static void downloadRemoteURI(String assetPackageURI, boolean useCache, final AsyncCallback<ArrayBuffer> cb) {
-		doFetchDownload(assetPackageURI, useCache ? "force-cache" : "no-store", (bb) -> cb.complete(bb));
+		doFetchDownload(assetPackageURI, useCache ? "force-cache" : "no-store", cb::complete);
 	}
 	
 	public static boolean isDebugRuntime() {
@@ -577,9 +627,7 @@ public class PlatformRuntime {
 						a.setHref(url);
 						a.click();
 						TeaVMUtils.freeDataURL(url);
-					}, (msg) -> {
-						logger.info(msg);
-					});
+					}, logger::info);
 				}
 			});
 			onRecFrame();
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformWebRTC.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformWebRTC.java
index cea3152..d43a9c7 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformWebRTC.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformWebRTC.java
@@ -1,6 +1,7 @@
 package net.lax1dude.eaglercraft.v1_8.internal;
 
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
 import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMUtils;
 import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
 import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
@@ -29,7 +30,6 @@ import org.teavm.jso.websocket.WebSocket;
 import com.google.common.collect.LinkedListMultimap;
 import com.google.common.collect.ListMultimap;
 
-import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.util.*;
@@ -619,7 +619,7 @@ public class PlatformWebRTC {
 					}else {
 						if(open) {
 							try {
-								IPacket pkt = IPacket.readPacket(new DataInputStream(new ByteArrayInputStream(arr)));
+								IPacket pkt = IPacket.readPacket(new DataInputStream(new EaglerInputStream(arr)));
 								if(pkt instanceof IPacket69Pong) {
 									IPacket69Pong ipkt = (IPacket69Pong)pkt;
 									versError = VersionMismatch.COMPATIBLE;
@@ -875,7 +875,7 @@ public class PlatformWebRTC {
 					}else {
 						if(open) {
 							try {
-								IPacket pkt = IPacket.readPacket(new DataInputStream(new ByteArrayInputStream(arr)));
+								IPacket pkt = IPacket.readPacket(new DataInputStream(new EaglerInputStream(arr)));
 								if(pkt instanceof IPacket07LocalWorlds) {
 									worlds = ((IPacket07LocalWorlds)pkt).worldsList;
 									sock.close();
@@ -1065,7 +1065,7 @@ public class PlatformWebRTC {
 				if(evt.getData() != null && !isString(evt.getData())) {
 					hasRecievedAnyData = true;
 					try {
-						IPacket pkt = IPacket.readPacket(new DataInputStream(new ByteArrayInputStream(TeaVMUtils.wrapUnsignedByteArray(Uint8Array.create(evt.getDataAsArray())))));
+						IPacket pkt = IPacket.readPacket(new DataInputStream(new EaglerInputStream(TeaVMUtils.wrapUnsignedByteArray(Uint8Array.create(evt.getDataAsArray())))));
 						if(pkt instanceof IPacket70SpecialUpdate) {
 							IPacket70SpecialUpdate ipkt = (IPacket70SpecialUpdate)pkt;
 							if(ipkt.operation == IPacket70SpecialUpdate.OPERATION_UPDATE_CERTIFICATE) {
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerArrayBufferAllocator.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerArrayBufferAllocator.java
index 1e9261c..a4c8aa5 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerArrayBufferAllocator.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/buffer/EaglerArrayBufferAllocator.java
@@ -3,6 +3,7 @@ package net.lax1dude.eaglercraft.v1_8.internal.buffer;
 import org.teavm.jso.typedarrays.ArrayBuffer;
 import org.teavm.jso.typedarrays.DataView;
 import org.teavm.jso.typedarrays.Float32Array;
+import org.teavm.jso.typedarrays.Int32Array;
 import org.teavm.jso.typedarrays.Uint16Array;
 import org.teavm.jso.typedarrays.Uint8Array;
 
@@ -126,6 +127,19 @@ public class EaglerArrayBufferAllocator {
 		}
 	}
 	
+	public static Int32Array getDataViewStupid32(IntBuffer buffer) {
+		if(buffer instanceof EaglerArrayIntBuffer) {
+			EaglerArrayIntBuffer b = (EaglerArrayIntBuffer)buffer;
+			DataView d = b.dataView;
+			int p = b.position;
+			int l = b.limit;
+			int i = d.getByteOffset();
+			return Int32Array.create(d.getBuffer(), i + (p << 2), (l - p) << 2);
+		}else {
+			throw notEagler(buffer);
+		}
+	}
+	
 	public static DataView getDataView(FloatBuffer buffer) {
 		if(buffer instanceof EaglerArrayFloatBuffer) {
 			EaglerArrayFloatBuffer b = (EaglerArrayFloatBuffer)buffer;
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/BooleanResult.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/BooleanResult.java
similarity index 93%
rename from src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/BooleanResult.java
rename to src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/BooleanResult.java
index 0270e5d..8cc0d02 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/BooleanResult.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/BooleanResult.java
@@ -1,4 +1,4 @@
-package net.lax1dude.eaglercraft.v1_8.internal.vfs;
+package net.lax1dude.eaglercraft.v1_8.internal.teavm;
 
 /**
  * Copyright (c) 2022-2023 lax1dude. All Rights Reserved.
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ClientMain.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ClientMain.java
index 3d4f6e2..91c4db1 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ClientMain.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/ClientMain.java
@@ -321,8 +321,9 @@ public class ClientMain {
 		}else {
 			System.err.println();
 			System.err.println("An additional crash report was supressed:");
-			for(String l : t.split("[\\r\\n]+")) {
-				System.err.println("  " + l);
+			String[] s = t.split("[\\r\\n]+");
+			for(int i = 0; i < s.length; ++i) {
+				System.err.println("  " + s[i]);
 			}
 		}
 	}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/EarlyLoadScreen.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/EarlyLoadScreen.java
index efb9233..e5b8be3 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/EarlyLoadScreen.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/EarlyLoadScreen.java
@@ -245,8 +245,10 @@ public class EarlyLoadScreen {
 		_wglBindTexture(GL_TEXTURE_2D, null);
 		_wglDeleteTextures(tex);
 		_wglDeleteVertexArrays(vao);
+	}
+	
+	public static void destroy() {
 		_wglDeleteBuffers(vbo);
 		_wglDeleteProgram(program);
 	}
-	
 }
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapter.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapter.java
index 880ae3c..b6aae03 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapter.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapter.java
@@ -1,16 +1,13 @@
 package net.lax1dude.eaglercraft.v1_8.internal.teavm;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
-import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion;
+import net.lax1dude.eaglercraft.v1_8.ThreadLocalRandom;
 import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayManager;
-import net.minecraft.nbt.CompressedStreamTools;
-import net.minecraft.nbt.NBTTagCompound;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -41,8 +38,9 @@ public class TeaVMClientConfigAdapter implements IClientConfigAdapter {
 	private List<RelayEntry> relays = new ArrayList();
 	private String serverToJoin = null;   
 	private String worldsDB = "worlds";
+	private String resourcePacksDB = "resourcePacks";
 	private JSONObject originalEaglercraftOpts;
-	private boolean isCheckShaderGLErrors = false;
+	private boolean checkShaderGLErrors = false;
 	private boolean demoMode = EaglercraftVersion.forceDemoMode;
 	private boolean isAllowUpdateSvc = EaglercraftVersion.enableUpdateService;
 	private boolean isAllowUpdateDL = EaglercraftVersion.enableUpdateService;
@@ -52,14 +50,14 @@ public class TeaVMClientConfigAdapter implements IClientConfigAdapter {
 	private boolean logInvalidCerts = false;
 	private boolean checkRelaysForUpdates = false;
 	private boolean enableSignatureBadge = false;
-	private static final EaglercraftRandom random = new EaglercraftRandom();
 
 	public void loadJSON(JSONObject eaglercraftOpts) {
 		originalEaglercraftOpts = eaglercraftOpts;
 		defaultLocale = eaglercraftOpts.optString("lang", "en_US");
 		serverToJoin = eaglercraftOpts.optString("joinServer", null);
 		worldsDB = eaglercraftOpts.optString("worldsDB", "worlds");
-		isCheckShaderGLErrors = eaglercraftOpts.optBoolean("checkShaderGLErrors", false);
+		resourcePacksDB = eaglercraftOpts.optString("resourcePacksDB", "resourcePacks");
+		checkShaderGLErrors = eaglercraftOpts.optBoolean("checkShaderGLErrors", false);
 		if(EaglercraftVersion.forceDemoMode) {
 			eaglercraftOpts.put("demoMode", true);
 		}
@@ -88,7 +86,7 @@ public class TeaVMClientConfigAdapter implements IClientConfigAdapter {
 			boolean gotAPrimary = false;
 			for (int i = 0, l = relaysArray.length(); i < l; ++i) {
 				JSONObject relay = relaysArray.getJSONObject(i);
-				boolean p = relay.getBoolean("primary");
+				boolean p = relay.optBoolean("primary");
 				if(p) {
 					if(gotAPrimary) {
 						p = false;
@@ -100,42 +98,28 @@ public class TeaVMClientConfigAdapter implements IClientConfigAdapter {
 			}
 		}
 
+		boolean officialUpdates = !demoMode && EaglercraftVersion.updateBundlePackageName.equals("net.lax1dude.eaglercraft.v1_8.client");
 		if (relays.size() <= 0) {
-			int choice = random.nextInt(3);
+			int choice = ThreadLocalRandom.current().nextInt(3);
 			relays.add(new RelayEntry("wss://relay.deev.is/", "lax1dude relay #1", choice == 0));
 			relays.add(new RelayEntry("wss://relay.lax1dude.net/", "lax1dude relay #2", choice == 1));
 			relays.add(new RelayEntry("wss://relay.shhnowisnottheti.me/", "ayunami relay #1", choice == 2));
-			checkRelaysForUpdates = !demoMode && eaglercraftOpts.optBoolean("checkRelaysForUpdates", true);
+			checkRelaysForUpdates = !demoMode && eaglercraftOpts.optBoolean("checkRelaysForUpdates", officialUpdates);
 		}else {
-			boolean isOfficial = true;
-			for(int i = 0, l = relays.size(); i < l; ++i) {
-				String addr = relays.get(i).address;
-				if(!addr.contains("deev.is") && !addr.contains("lax1dude.net") && !addr.contains("shhnowisnottheti.me")) {
-					isOfficial = false;
-					break;
+			if(officialUpdates) {
+				for(int i = 0, l = relays.size(); i < l; ++i) {
+					String addr = relays.get(i).address;
+					if(!addr.contains("deev.is") && !addr.contains("lax1dude.net") && !addr.contains("shhnowisnottheti.me")) {
+						officialUpdates = false;
+						break;
+					}
 				}
 			}
-			checkRelaysForUpdates = !demoMode && eaglercraftOpts.optBoolean("checkRelaysForUpdates", isOfficial);
+			checkRelaysForUpdates = !demoMode && eaglercraftOpts.optBoolean("checkRelaysForUpdates", officialUpdates);
 		}
 		
-		try {
-			byte[] localStorage = EagRuntime.getStorage("r");
-
-			if (localStorage != null) {
-				NBTTagCompound nbttagcompound = CompressedStreamTools
-						.readCompressed(new EaglerInputStream(localStorage));
-				if (nbttagcompound == null) {
-					RelayManager.relayManager.load(null);
-				} else {
-					RelayManager.relayManager.load(nbttagcompound.getTagList("relays", 10));
-				}
-			} else {
-				RelayManager.relayManager.load(null);
-			}
-		} catch (IOException e) {
-			EagRuntime.debugPrintStackTrace(e);
-		}
-
+		RelayManager.relayManager.load(EagRuntime.getStorage("r"));
+		
 		if (RelayManager.relayManager.count() <= 0) {
 			RelayManager.relayManager.loadDefaults();
 			RelayManager.relayManager.save();
@@ -162,6 +146,11 @@ public class TeaVMClientConfigAdapter implements IClientConfigAdapter {
 		return worldsDB;
 	}
 
+	@Override
+	public String getResourcePacksDB() {
+		return resourcePacksDB;
+	}
+
 	@Override
 	public JSONObject dumpConfig() {
 		return originalEaglercraftOpts;
@@ -173,8 +162,8 @@ public class TeaVMClientConfigAdapter implements IClientConfigAdapter {
 	}
 
 	@Override
-	public boolean checkShaderGLErrors() {
-		return isCheckShaderGLErrors;
+	public boolean isCheckShaderGLErrors() {
+		return checkShaderGLErrors;
 	}
 
 	@Override
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMUpdateThread.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMUpdateThread.java
index 87a4b7a..ce0b6e7 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMUpdateThread.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMUpdateThread.java
@@ -153,7 +153,7 @@ public class TeaVMUpdateThread implements Runnable {
 					return;
 				}
 				updateProg.statusString2 = "Signature Invalid!";
-				logger.error("File signature is invalid: {}");
+				logger.error("File signature is invalid: {}", url);
 				EagUtils.sleep(1000l);
 			}
 			
@@ -222,11 +222,11 @@ public class TeaVMUpdateThread implements Runnable {
 						if(data.getByteLength() == updateCert.bundleDataLength) {
 							cb.complete(TeaVMUtils.wrapUnsignedByteArray(Uint8Array.create(data)));
 						}else {
-							logger.error("Unexpected response length {} (expect: {}) from URL: {}", xhr.getStatus(), xhr.getStatusText());
+							logger.error("Unexpected response length {} (expect: {}) from URL: {}", xhr.getStatus(), xhr.getStatusText(), url);
 							cb.complete(null);
 						}
 					}else {
-						logger.error("Got response code {} \"{}\" for url: {}", xhr.getStatus(), xhr.getStatusText());
+						logger.error("Got response code {} \"{}\" for url: {}", xhr.getStatus(), xhr.getStatusText(), url);
 						cb.complete(null);
 					}
 				}
@@ -251,7 +251,7 @@ public class TeaVMUpdateThread implements Runnable {
 	}
 
 	public static void downloadSignedOffline(UpdateCertificate cert, byte[] data) {
-		PlatformApplication.downloadFileWithName(cert.bundleDisplayName.replaceAll("[^a-zA-Z0-9\\-_]", "_") + "_" + cert.bundleDisplayVersion.replaceAll("[^a-zA-Z0-9\\-_]", "_") + "_Offline_Signed.html", generateSignedOffline(cert, data));
+		PlatformApplication.downloadFileWithName(cert.bundleDisplayName.replaceAll("[^a-zA-Z0-9\\-_\\.]", "_") + "_" + cert.bundleDisplayVersion.replaceAll("[^a-zA-Z0-9\\-_]", "_") + "_Offline_Signed.html", generateSignedOffline(cert, data));
 	}
 
 	public static byte[] generateSignedOffline(UpdateCertificate cert, byte[] data) {
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMUtils.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMUtils.java
index f923986..fd21f5b 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMUtils.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMUtils.java
@@ -53,6 +53,10 @@ public class TeaVMUtils {
 		return Int8Array.create(((TeaVMArrayObject)(Object)buf).getData().getBuffer());
 	}
 
+	public static ArrayBuffer unwrapArrayBuffer(byte[] buf) {
+		return ((TeaVMArrayObject)(Object)buf).getData().getBuffer();
+	}
+
 	@JSBody(params = { "buf" }, script = "return $rt_createByteArray(buf.buffer)")
 	private static native JSObject wrapByteArray0(JSObject buf);
 
@@ -72,6 +76,10 @@ public class TeaVMUtils {
 		return Int32Array.create(((TeaVMArrayObject)(Object)buf).getData().getBuffer());
 	}
 
+	public static ArrayBuffer unwrapArrayBuffer(int[] buf) {
+		return ((TeaVMArrayObject)(Object)buf).getData().getBuffer();
+	}
+
 	@JSBody(params = { "buf" }, script = "return $rt_createIntArray(buf.buffer)")
 	private static native JSObject wrapIntArray0(JSObject buf);
 
@@ -83,6 +91,10 @@ public class TeaVMUtils {
 		return Float32Array.create(((TeaVMArrayObject)(Object)buf).getData().getBuffer());
 	}
 
+	public static ArrayBuffer unwrapArrayBuffer(float[] buf) {
+		return ((TeaVMArrayObject)(Object)buf).getData().getBuffer();
+	}
+
 	@JSBody(params = { "buf" }, script = "return $rt_createFloatArray(buf.buffer)")
 	private static native JSObject wrapFloatArray0(JSObject buf);
 
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/FolderResourcePack.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/FolderResourcePack.java
deleted file mode 100755
index 07b5510..0000000
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/FolderResourcePack.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package net.lax1dude.eaglercraft.v1_8.internal.vfs;
-
-import com.google.common.collect.Sets;
-import net.minecraft.client.resources.AbstractResourcePack;
-
-import java.io.InputStream;
-import java.util.List;
-import java.util.Set;
-
-/**
- * Copyright (c) 2022-2023 lax1dude, ayunami2000. All Rights Reserved.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- */
-public class FolderResourcePack extends AbstractResourcePack {
-	private final String prefix;
-
-	public FolderResourcePack(String resourcePackFileIn, String prefix) {
-		super(resourcePackFileIn);
-		this.prefix = prefix;
-	}
-
-	protected InputStream getInputStreamByName(String name) {
-		return SYS.VFS.getFile(prefix + this.resourcePackFile + "/" + name).getInputStream();
-	}
-
-	protected boolean hasResourceName(String name) {
-		return SYS.VFS.fileExists(prefix + this.resourcePackFile + "/" + name);
-	}
-
-	public Set<String> getResourceDomains() {
-		Set<String> set = Sets.<String>newHashSet();
-		String pfx = prefix + this.resourcePackFile + "/assets/";
-		List<String> files = SYS.VFS.listFiles(pfx);
-
-		for (String file : files) {
-			String s = file.substring(pfx.length());
-			int ind = s.indexOf('/');
-			if (ind != -1) s = s.substring(0, ind);
-			if (!s.equals(s.toLowerCase())) {
-				this.logNameNotLowercase(s);
-			} else {
-				set.add(s);
-			}
-		}
-
-		return set;
-	}
-}
\ No newline at end of file
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/SYS.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/SYS.java
deleted file mode 100755
index f83e8a9..0000000
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/SYS.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package net.lax1dude.eaglercraft.v1_8.internal.vfs;
-
-import net.lax1dude.eaglercraft.v1_8.EagRuntime;
-import net.lax1dude.eaglercraft.v1_8.crypto.SHA1Digest;
-import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
-import net.lax1dude.eaglercraft.v1_8.internal.teavm.ArrayBufferInputStream;
-import net.lax1dude.eaglercraft.v1_8.internal.vfs.VirtualFilesystem.VFSHandle;
-
-import java.io.BufferedInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-/**
- * Copyright (c) 2022-2023 lax1dude, ayunami2000. All Rights Reserved.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- */
-public class SYS {
-
-	public static final VirtualFilesystem VFS;
-	
-	static {
-		VFSHandle vh = VirtualFilesystem.openVFS("_net_lax1dude_eaglercraft_v1_8_VirtualFilesystem_");
-		
-		if(vh.vfs == null) {
-			System.err.println("Could not init filesystem!");
-		}
-		
-		VFS = vh.vfs;
-
-		List<String> srp = getResourcePackNames(true);
-		for (String name : srp) {
-			if (System.currentTimeMillis() - Long.parseLong(name.substring(name.lastIndexOf('_') + 1)) >= 604800000L) {
-				deleteResourcePack(name, true);
-			}
-		}
-	}
-
-	public static final void loadRemoteResourcePack(String url, String hash, Consumer<String> cb, Consumer<Runnable> ast, Runnable loading) {
-		if (!hash.matches("^[a-f0-9]{40}$")) {
-			cb.accept(null);
-			return;
-		}
-		List<String> srpPre = getResourcePackNames(true);
-		String alreadyHere = srpPre.stream().filter(s -> s.startsWith(hash + "_")).findFirst().orElse(null);
-		if (alreadyHere != null) {
-			cb.accept(alreadyHere);
-			return;
-		}
-		PlatformRuntime.downloadRemoteURI(url, ab -> {
-			ast.accept(() -> {
-				if (ab == null) {
-					cb.accept(null);
-					return;
-				}
-				List<String> srp = getResourcePackNames(true);
-				// delete old server resource packs - todo: test
-				if (srp.size() > 5) {
-					srp.sort(Comparator.comparingLong(val -> Long.parseLong(val.substring(val.lastIndexOf('_') + 1))));
-					for (int i = 0; i < srp.size() - 5; i++) {
-						deleteResourcePack(srp.get(i), true);
-					}
-				}
-				String packName = hash + "_" + System.currentTimeMillis();
-				loading.run();
-				boolean success = loadResourcePack(packName + ".zip", new ArrayBufferInputStream(ab), hash);
-				if (success) {
-					cb.accept(packName);
-					return;
-				}
-				cb.accept(null);
-			});
-		});
-	}
-
-	public static final boolean loadResourcePack(String name, InputStream is, String hash) {
-		BufferedInputStream bis = new BufferedInputStream(is);
-
-		bis.mark(Integer.MAX_VALUE);
-
-		if (hash != null) {
-			try {
-				SHA1Digest digest = new SHA1Digest();
-				byte[] buffer = new byte[16000];
-				int read = 0;
-
-				while ((read = bis.read(buffer)) > 0) {
-					digest.update(buffer, 0, read);
-				}
-
-				byte[] sha1sum = new byte[20];
-				digest.doFinal(sha1sum, 0);
-				bis.reset();
-				if (!hash.equals((new BigInteger(1, sha1sum)).toString(16))) {
-					return false;
-				}
-			} catch (IOException e) {
-				EagRuntime.debugPrintStackTrace(e);
-				return false;
-			}
-		}
-
-		String packName = name.substring(0, name.lastIndexOf('.')).replace('/', '_');
-		try {
-			int prefixLen = Integer.MAX_VALUE;
-			ZipInputStream ziss = new ZipInputStream(bis);
-			ZipEntry zipEntryy;
-			while ((zipEntryy = ziss.getNextEntry()) != null) {
-				String zn;
-				if (!zipEntryy.isDirectory() && ((zn = zipEntryy.getName()).equals("pack.mcmeta") || zn.endsWith("/pack.mcmeta"))) {
-					int currPrefixLen = zn.length() - 11;
-					if (prefixLen > currPrefixLen) {
-						prefixLen = currPrefixLen;
-					}
-				}
-			}
-			if (prefixLen == Integer.MAX_VALUE) {
-				prefixLen = 0;
-			}
-
-			bis.reset();
-
-			ZipInputStream zis = new ZipInputStream(bis);
-			byte[] bb = new byte[16000];
-			ZipEntry zipEntry;
-			while ((zipEntry = zis.getNextEntry()) != null) {
-				if (zipEntry.isDirectory()) continue;
-				if (zipEntry.getName().length() <= prefixLen) continue;
-				ByteArrayOutputStream baos = new ByteArrayOutputStream();
-				int len;
-				while ((len = zis.read(bb)) != -1) {
-					baos.write(bb, 0, len);
-				}
-				baos.close();
-				SYS.VFS.getFile((hash == null ? "resourcepacks/" : "srp/") + packName + "/" + zipEntry.getName().substring(prefixLen)).setAllBytes(baos.toByteArray());
-			}
-			zis.closeEntry();
-			zis.close();
-			return true;
-		} catch (IOException e) {
-			EagRuntime.debugPrintStackTrace(e);
-			return false;
-		}
-	}
-
-	public static final List<String> getResourcePackNames() {
-		return getResourcePackNames(false);
-	}
-
-	private static final List<String> getResourcePackNames(boolean srp) {
-		List<String> res = new ArrayList<>();
-		List<String> resourcePackFiles = SYS.VFS.listFiles(srp ? "srp/" : "resourcepacks/");
-		for (String path : resourcePackFiles) {
-			String trimmed = path.substring(srp ? 4 : 14);
-			trimmed = trimmed.substring(0, trimmed.indexOf('/'));
-			boolean hasIt = false;
-			for (String alreadyHas : res) {
-				if (trimmed.equals(alreadyHas)) {
-					hasIt = true;
-					break;
-				}
-			}
-			if (hasIt) continue;
-			res.add(trimmed);
-		}
-		return res;
-	}
-
-	public static final void deleteResourcePack(String packName) {
-		deleteResourcePack(packName, false);
-	}
-
-	private static final void deleteResourcePack(String packName, boolean srp) {
-		SYS.VFS.deleteFiles((srp ? "srp/" : "resourcepacks/") + packName);
-	}
-}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/VFSIterator.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/VFSIterator.java
deleted file mode 100755
index 377da96..0000000
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/VFSIterator.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package net.lax1dude.eaglercraft.v1_8.internal.vfs;
-
-/**
- * Copyright (c) 2022 lax1dude. All Rights Reserved.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- */
-public interface VFSIterator {
-	
-	public static class BreakLoop extends RuntimeException {
-		public BreakLoop() {
-			super("iterator loop break request");
-		}
-	}
-	
-	public default void end() {
-		throw new BreakLoop();
-	}
-	
-	public void next(VIteratorFile entry);
-	
-}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/VFile.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/VFile.java
deleted file mode 100755
index e6dfd5d..0000000
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/VFile.java
+++ /dev/null
@@ -1,242 +0,0 @@
-package net.lax1dude.eaglercraft.v1_8.internal.vfs;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Copyright (c) 2022 lax1dude. All Rights Reserved.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- */
-public class VFile {
-
-	public static final String pathSeperator = "/";
-	public static final String[] altPathSeperator = new String[] { "\\" };
-	
-	public static String normalizePath(String p) {
-		for(int i = 0; i < altPathSeperator.length; ++i) {
-			p = p.replace(altPathSeperator[i], pathSeperator);
-		}
-		if(p.startsWith(pathSeperator)) {
-			p = p.substring(1);
-		}
-		if(p.endsWith(pathSeperator)) {
-			p = p.substring(0, p.length() - pathSeperator.length());
-		}
-		return p;
-	}
-	
-	public static String[] splitPath(String p) {
-		String[] pth = normalizePath(p).split(pathSeperator);
-		for(int i = 0; i < pth.length; ++i) {
-			pth[i] = pth[i].trim();
-		}
-		return pth;
-	}
-	
-	protected String path;
-	
-	public static String createPath(Object... p) {
-		ArrayList<String> r = new ArrayList();
-		for(int i = 0; i < p.length; ++i) {
-			if(p[i] == null) {
-				continue;
-			}
-			String gg = p[i].toString();
-			if(gg == null) {
-				continue;
-			}
-			String[] parts = splitPath(gg);
-			for(int j = 0; j < parts.length; ++j) {
-				if(parts[j] == null || parts[j].equals(".")) {
-					continue;
-				}else if(parts[j].equals("..") && r.size() > 0) {
-					int k = r.size() - 1;
-					if(!r.get(k).equals("..")) {
-						r.remove(k);
-					}else {
-						r.add("..");
-					}
-				}else {
-					r.add(parts[j]);
-				}
-			}
-		}
-		if(r.size() > 0) {
-			StringBuilder s = new StringBuilder();
-			for(int i = 0; i < r.size(); ++i) {
-				if(i > 0) {
-					s.append(pathSeperator);
-				}
-				s.append(r.get(i));
-			}
-			return s.toString();
-		}else {
-			return null;
-		}
-	}
-	
-	public VFile(Object... p) {
-		this.path = createPath(p);
-	}
-	
-	public InputStream getInputStream() {
-		return isRelative() ? null : SYS.VFS.getFile(path).getInputStream();
-	}
-	
-	public OutputStream getOutputStream() {
-		return isRelative() ? null : SYS.VFS.getFile(path).getOutputStream();
-	}
-	
-	public String toString() {
-		return path;
-	}
-	
-	public boolean isRelative() {
-		return path == null || path.contains("..");
-	}
-	
-	public boolean canRead() {
-		return !isRelative() && SYS.VFS.fileExists(path);
-	}
-	
-	public String getPath() {
-		return path.equals("unnamed") ? null : path;
-	}
-	
-	public String getName() {
-		if(path == null) {
-			return null;
-		}
-		int i = path.indexOf(pathSeperator);
-		return i == -1 ? path : path.substring(i + 1);
-	}
-	
-	public boolean canWrite() {
-		return !isRelative();
-	}
-	
-	public String getParent() {
-		if(path == null) {
-			return null;
-		}
-		int i = path.indexOf(pathSeperator);
-		return i == -1 ? ".." : path.substring(0, i);
-	}
-	
-	public int hashCode() {
-		return path == null ? 0 : path.hashCode();
-	}
-	
-	public boolean equals(Object o) {
-		return path != null && o != null && (o instanceof VFile) && path.equals(((VFile)o).path);
-	}
-	
-	public boolean exists() {
-		return !isRelative() && SYS.VFS.fileExists(path);
-	}
-	
-	public boolean delete() {
-		return !isRelative() && SYS.VFS.deleteFile(path);
-	}
-	
-	public boolean renameTo(String p, boolean copy) {
-		if(!isRelative() && SYS.VFS.renameFile(path, p, copy)) {
-			path = p;
-			return true;
-		}
-		return false;
-	}
-	
-	public int length() {
-		return isRelative() ? -1 : SYS.VFS.getFile(path).getSize();
-	}
-	
-	public void getBytes(int fileOffset, byte[] array, int offset, int length) {
-		if(isRelative()) {
-			throw new ArrayIndexOutOfBoundsException("File is relative");
-		}
-		SYS.VFS.getFile(path).getBytes(fileOffset, array, offset, length);
-	}
-	
-	public void setCacheEnabled() {
-		if(isRelative()) {
-			throw new RuntimeException("File is relative");
-		}
-		SYS.VFS.getFile(path).setCacheEnabled();
-	}
-	
-	public byte[] getAllBytes() {
-		if(isRelative()) {
-			return null;
-		}
-		return SYS.VFS.getFile(path).getAllBytes();
-	}
-	
-	public String getAllChars() {
-		if(isRelative()) {
-			return null;
-		}
-		return SYS.VFS.getFile(path).getAllChars();
-	}
-	
-	public String[] getAllLines() {
-		if(isRelative()) {
-			return null;
-		}
-		return SYS.VFS.getFile(path).getAllLines();
-	}
-	
-	public byte[] getAllBytes(boolean copy) {
-		if(isRelative()) {
-			return null;
-		}
-		return SYS.VFS.getFile(path).getAllBytes(copy);
-	}
-	
-	public boolean setAllChars(String bytes) {
-		if(isRelative()) {
-			return false;
-		}
-		return SYS.VFS.getFile(path).setAllChars(bytes);
-	}
-	
-	public boolean setAllBytes(byte[] bytes) {
-		if(isRelative()) {
-			return false;
-		}
-		return SYS.VFS.getFile(path).setAllBytes(bytes);
-	}
-	
-	public boolean setAllBytes(byte[] bytes, boolean copy) {
-		if(isRelative()) {
-			return false;
-		}
-		return SYS.VFS.getFile(path).setAllBytes(bytes, copy);
-	}
-	
-	public List<String> list() {
-		if(isRelative()) {
-			return Arrays.asList(path);
-		}
-		return SYS.VFS.listFiles(path);
-	}
-	
-	public int deleteAll() {
-		return isRelative() ? 0 : SYS.VFS.deleteFiles(path);
-	}
-	
-}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/VIteratorFile.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/VIteratorFile.java
deleted file mode 100755
index ca9d3f5..0000000
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/VIteratorFile.java
+++ /dev/null
@@ -1,299 +0,0 @@
-package net.lax1dude.eaglercraft.v1_8.internal.vfs;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.List;
-
-import org.teavm.interop.Async;
-import org.teavm.interop.AsyncCallback;
-import org.teavm.jso.JSBody;
-import org.teavm.jso.JSObject;
-import org.teavm.jso.dom.events.Event;
-import org.teavm.jso.dom.events.EventListener;
-import org.teavm.jso.indexeddb.IDBCursor;
-import org.teavm.jso.indexeddb.IDBRequest;
-import org.teavm.jso.typedarrays.ArrayBuffer;
-import org.teavm.jso.typedarrays.Uint8Array;
-
-import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMUtils;
-
-/**
- * Copyright (c) 2022 lax1dude. All Rights Reserved.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- */
-
-/**
- * Do not use an instance of this class outside of the VFSIterator.next() method
- */
-public class VIteratorFile extends VFile {
-	
-	static final VIteratorFile instance = new VIteratorFile();
-	
-	private VIteratorFile() {
-		super("");
-		this.idx = -1;
-		this.cur = null;
-		this.vfs = null;
-	}
-	
-	private static class VirtualIteratorOutputStream extends ByteArrayOutputStream {
-		
-		private final VIteratorFile itr;
-		
-		protected VirtualIteratorOutputStream(VIteratorFile itr) {
-			this.itr = itr;
-		}
-		
-		public void close() throws IOException {
-			if(!itr.setAllBytes(super.toByteArray(), false)) {
-				throw new IOException("Could not close stream and write to \"" + itr.path + "\" on VFS \"" + itr.vfs.database + "\" (the file was probably deleted)");
-			}
-		}
-		
-	}
-	
-	private int idx;
-	private IDBCursor cur;
-	private VirtualFilesystem vfs;
-	private boolean wasDeleted;
-	
-	@JSBody(params = { "k" }, script = "return ((typeof k) === \"string\") ? k : (((typeof k) === \"undefined\") ? null : (((typeof k[0]) === \"string\") ? k[0] : null));")
-	private static native String readKey(JSObject k);
-	
-	static VIteratorFile create(int idx, VirtualFilesystem vfs, IDBCursor cur) {
-		String k = readKey(cur.getKey());
-		if(k == null) {
-			return null;
-		}
-		instance.update(idx, k, vfs, cur);
-		return instance;
-	}
-	
-	public VFile makeVFile() {
-		return new VFile(path);
-	}
-	
-	private void update(int idx, String path, VirtualFilesystem vfs, IDBCursor cur) {
-		this.idx = idx;
-		this.path = path;
-		this.vfs =  vfs;
-		this.cur = cur;
-		this.wasDeleted = false;
-	}
-	
-	public InputStream getInputStream() {
-		return !wasDeleted ? new ByteArrayInputStream(getAllBytes()) : null;
-	}
-	
-	public OutputStream getOutputStream() {
-		return !wasDeleted ? new VirtualIteratorOutputStream(this) : null;
-	}
-	
-	public String toString() {
-		return path;
-	}
-	
-	public boolean isRelative() {
-		return false;
-	}
-	
-	public boolean canRead() {
-		return !wasDeleted;
-	}
-	
-	public String getPath() {
-		return path;
-	}
-	
-	public String getName() {
-		if(path == null) {
-			return null;
-		}
-		int i = path.indexOf(pathSeperator);
-		return i == -1 ? path : path.substring(i + 1);
-	}
-	
-	public boolean canWrite() {
-		return !wasDeleted;
-	}
-	
-	public String getParent() {
-		if(path == null) {
-			return null;
-		}
-		int i = path.indexOf(pathSeperator);
-		return i == -1 ? ".." : path.substring(0, i);
-	}
-	
-	public int hashCode() {
-		return path == null ? 0 : path.hashCode();
-	}
-	
-	public boolean equals(Object o) {
-		return path != null && o != null && (o instanceof VFile) && path.equals(((VFile)o).path);
-	}
-	
-	public boolean exists() {
-		return !wasDeleted;
-	}
-	
-	public boolean delete() {
-		return wasDeleted = AsyncHandlers.awaitRequest(cur.delete()).bool;
-	}
-	
-	public boolean renameTo(String p) {
-		byte[] data = getAllBytes();
-		String op = path;
-		path = p;
-		if(!setAllBytes(data)) {
-			path = op;
-			return false;
-		}
-		path = op;
-		if(!delete()) {
-			return false;
-		}
-		path = p;
-		return true;
-	}
-	
-	public int length() {
-		JSObject obj = cur.getValue();
-		
-		if(obj == null) {
-			throw new RuntimeException("Value of entry is missing");
-		}
-		
-		ArrayBuffer arr = readRow(obj);
-	
-		if(arr == null) {
-			throw new RuntimeException("Value of the fucking value of the entry is missing");
-		}
-		
-		return arr.getByteLength();
-	}
-	
-	public void getBytes(int fileOffset, byte[] array, int offset, int length) {
-		JSObject obj = cur.getValue();
-		
-		if(obj == null) {
-			throw new ArrayIndexOutOfBoundsException("Value of entry is missing");
-		}
-		
-		ArrayBuffer arr = readRow(obj);
-
-		if(arr == null) {
-			throw new ArrayIndexOutOfBoundsException("Value of the fucking value of the entry is missing");
-		}
-		
-		Uint8Array a = Uint8Array.create(arr);
-		
-		if(a.getLength() < fileOffset + length) {
-			throw new ArrayIndexOutOfBoundsException("file '" + path + "' size was "+a.getLength()+" but user tried to read index "+(fileOffset + length - 1));
-		}
-		
-		for(int i = 0; i < length; ++i) {
-			array[i + offset] = (byte)a.get(i + fileOffset);
-		}
-	}
-	
-	public void setCacheEnabled() {
-		// no
-	}
-	
-	@JSBody(params = { "obj" }, script = "return (typeof obj === 'undefined') ? null : ((typeof obj.data === 'undefined') ? null : obj.data);")
-	private static native ArrayBuffer readRow(JSObject obj);
-	
-	public byte[] getAllBytes() {
-		JSObject obj = cur.getValue();
-		
-		if(obj == null) {
-			return null;
-		}
-		
-		ArrayBuffer arr = readRow(obj);
-
-		if(arr == null) {
-			return null;
-		}
-
-		return TeaVMUtils.wrapUnsignedByteArray(Uint8Array.create(arr));
-	}
-	
-	public String getAllChars() {
-		return VirtualFilesystem.utf8(getAllBytes());
-	}
-	
-	public String[] getAllLines() {
-		return VirtualFilesystem.lines(VirtualFilesystem.utf8(getAllBytes()));
-	}
-	
-	public byte[] getAllBytes(boolean copy) {
-		return getAllBytes();
-	}
-	
-	public boolean setAllChars(String bytes) {
-		return setAllBytes(VirtualFilesystem.utf8(bytes));
-	}
-	
-	public List<String> list() {
-		throw new RuntimeException("Cannot perform list all in VFS callback");
-	}
-	
-	public int deleteAll() {
-		throw new RuntimeException("Cannot perform delete all in VFS callback");
-	}
-	
-	@JSBody(params = { "pat", "dat" }, script = "return { path: pat, data: dat };")
-	private static native JSObject writeRow(String name, ArrayBuffer data);
-	
-	public boolean setAllBytes(byte[] bytes) {
-		ArrayBuffer a = ArrayBuffer.create(bytes.length);
-		Uint8Array ar = Uint8Array.create(a);
-		ar.set(bytes);
-		JSObject obj = writeRow(path, a);
-		BooleanResult r = AsyncHandlers.awaitRequest(cur.update(obj));
-		return r.bool;
-	}
-	
-	public boolean setAllBytes(byte[] bytes, boolean copy) {
-		return setAllBytes(bytes);
-	}
-	
-	public static class AsyncHandlers {
-		
-		@Async
-		public static native BooleanResult awaitRequest(IDBRequest r);
-		
-		private static void awaitRequest(IDBRequest r, final AsyncCallback<BooleanResult> cb) {
-			r.addEventListener("success", new EventListener<Event>() {
-				@Override
-				public void handleEvent(Event evt) {
-					cb.complete(BooleanResult._new(true));
-				}
-			});
-			r.addEventListener("error", new EventListener<Event>() {
-				@Override
-				public void handleEvent(Event evt) {
-					cb.complete(BooleanResult._new(false));
-				}
-			});
-		}
-		
-	}
-	
-}
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/VirtualFilesystem.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/VirtualFilesystem.java
deleted file mode 100755
index 492539a..0000000
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/vfs/VirtualFilesystem.java
+++ /dev/null
@@ -1,702 +0,0 @@
-package net.lax1dude.eaglercraft.v1_8.internal.vfs;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
-import net.lax1dude.eaglercraft.v1_8.internal.teavm.TeaVMUtils;
-
-import org.teavm.interop.Async;
-import org.teavm.interop.AsyncCallback;
-import org.teavm.jso.JSBody;
-import org.teavm.jso.JSObject;
-import org.teavm.jso.dom.events.EventListener;
-import org.teavm.jso.indexeddb.EventHandler;
-import org.teavm.jso.indexeddb.IDBCountRequest;
-import org.teavm.jso.indexeddb.IDBCursor;
-import org.teavm.jso.indexeddb.IDBCursorRequest;
-import org.teavm.jso.indexeddb.IDBDatabase;
-import org.teavm.jso.indexeddb.IDBFactory;
-import org.teavm.jso.indexeddb.IDBGetRequest;
-import org.teavm.jso.indexeddb.IDBObjectStoreParameters;
-import org.teavm.jso.indexeddb.IDBOpenDBRequest;
-import org.teavm.jso.indexeddb.IDBRequest;
-import org.teavm.jso.indexeddb.IDBTransaction;
-import org.teavm.jso.indexeddb.IDBVersionChangeEvent;
-import org.teavm.jso.typedarrays.ArrayBuffer;
-import org.teavm.jso.typedarrays.Uint8Array;
-
-/**
- * Copyright (c) 2022 lax1dude. All Rights Reserved.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- */
-public class VirtualFilesystem {
-	
-	protected static class VirtualOutputStream extends ByteArrayOutputStream {
-		private final VFSFile file;
-		
-		protected VirtualOutputStream(VFSFile file) {
-			this.file = file;
-		}
-
-		public void close() throws IOException {
-			if(!file.setAllBytes(super.toByteArray(), false)) {
-				throw new IOException("Could not close stream and write to \"" + file.filePath + "\" on VFS \"" + file.virtualFilesystem.database + "\" (the file was probably deleted)");
-			}
-		}
-	}
-	
-	public static class VFSFile {
-
-		public final VirtualFilesystem virtualFilesystem;
-		protected boolean cacheEnabled;
-		protected String filePath;
-		protected int fileSize = -1;
-		protected boolean hasBeenDeleted = false;
-		protected boolean hasBeenAccessed = false;
-		protected boolean exists = false;
-
-		protected byte[] cache = null;
-		protected long cacheHit;
-		
-		protected VFSFile(VirtualFilesystem vfs, String filePath, boolean cacheEnabled) {
-			this.virtualFilesystem = vfs;
-			this.filePath = filePath;
-			this.cacheHit = System.currentTimeMillis();
-			if(cacheEnabled) {
-				setCacheEnabled();
-			}
-		}
-		
-		public boolean equals(Object o) {
-			return (o instanceof VFSFile) && ((VFSFile)o).filePath.equals(filePath);
-		}
-		
-		public int hashCode() {
-			return filePath.hashCode();
-		}
-		
-		public String getPath() {
-			return filePath;
-		}
-		
-		public int getSize() {
-			cacheHit = System.currentTimeMillis();
-			if(fileSize < 0) {
-				if(cacheEnabled) {
-					byte[] b = getAllBytes(false);
-					if(b != null) {
-						fileSize = b.length;
-					}
-				}else {
-					ArrayBuffer dat = AsyncHandlers.readWholeFile(virtualFilesystem.indexeddb, filePath);
-					if(dat != null) {
-						fileSize = dat.getByteLength();
-					}
-				}
-			}
-			return fileSize;
-		}
-		
-		public InputStream getInputStream() {
-			byte[] dat = getAllBytes(false);
-			if(dat == null) {
-				return null;
-			}
-			return new EaglerInputStream(dat);
-		}
-		
-		public OutputStream getOutputStream() {
-			return new VirtualOutputStream(this);
-		}
-		
-		public void getBytes(int fileOffset, byte[] array, int offset, int length) {
-			if(hasBeenDeleted) {
-				throw new ArrayIndexOutOfBoundsException("file '" + filePath + "' has been deleted");
-			}else if(hasBeenAccessed && !exists) {
-				throw new ArrayIndexOutOfBoundsException("file '" + filePath + "' does not exist");
-			}
-			cacheHit = System.currentTimeMillis();
-			if(cacheEnabled && cache != null) {
-				System.arraycopy(cache, fileOffset, array, offset, length);
-			}else {
-				ArrayBuffer aa = AsyncHandlers.readWholeFile(virtualFilesystem.indexeddb, filePath);
-				hasBeenAccessed = true;
-				if(aa != null) {
-					exists = true;
-				}else {
-					exists = false;
-					throw new ArrayIndexOutOfBoundsException("file '" + filePath + "' does not exist");
-				}
-				Uint8Array a = Uint8Array.create(aa);
-				this.fileSize = a.getByteLength();
-				if(cacheEnabled) {
-					cache = new byte[fileSize];
-					for(int i = 0; i < fileSize; ++i) {
-						cache[i] = (byte)a.get(i);
-					}
-				}
-				if(a.getLength() < fileOffset + length) {
-					throw new ArrayIndexOutOfBoundsException("file '" + filePath + "' size was "+a.getLength()+" but user tried to read index "+(fileOffset + length - 1));
-				}
-				for(int i = 0; i < length; ++i) {
-					array[i + offset] = (byte)a.get(i + fileOffset);
-				}
-			}
-		}
-		
-		public void setCacheEnabled() {
-			if(!cacheEnabled && !hasBeenDeleted && !(hasBeenAccessed && !exists)) {
-				cacheHit = System.currentTimeMillis();
-				cache = getAllBytes(false);
-				cacheEnabled = true;
-			}
-		}
-		
-		public byte[] getAllBytes() {
-			return getAllBytes(false);
-		}
-		
-		public String getAllChars() {
-			return utf8(getAllBytes(false));
-		}
-		
-		public String[] getAllLines() {
-			return lines(getAllChars());
-		}
-		
-		public byte[] getAllBytes(boolean copy) {
-			if(hasBeenDeleted || (hasBeenAccessed && !exists)) {
-				return null;
-			}
-			cacheHit = System.currentTimeMillis();
-			if(cacheEnabled && cache != null) {
-				byte[] b = cache;
-				if(copy) {
-					b = new byte[cache.length];
-					System.arraycopy(cache, 0, b, 0, cache.length);
-				}
-				return b;
-			}else {
-				hasBeenAccessed = true;
-				ArrayBuffer b = AsyncHandlers.readWholeFile(virtualFilesystem.indexeddb, filePath);
-				if(b != null) {
-					exists = true;
-				}else {
-					exists = false;
-					return null;
-				}
-				Uint8Array a = Uint8Array.create(b);
-				this.fileSize = a.getByteLength();
-				byte[] array = TeaVMUtils.wrapUnsignedByteArray(a);
-				if(cacheEnabled) {
-					if(copy) {
-						cache = new byte[fileSize];
-						System.arraycopy(b, 0, cache, 0, cache.length);
-					}else {
-						cache = array;
-					}
-				}
-				return array;
-			}
-		}
-		
-		public boolean setAllChars(String bytes) {
-			return setAllBytes(utf8(bytes), true);
-		}
-		
-		public boolean setAllBytes(byte[] bytes) {
-			return setAllBytes(bytes, true);
-		}
-		
-		public boolean setAllBytes(byte[] bytes, boolean copy) {
-			if(hasBeenDeleted || bytes == null) {
-				return false;
-			}
-			cacheHit = System.currentTimeMillis();
-			this.fileSize = bytes.length;
-			if(cacheEnabled) {
-				byte[] copz = bytes;
-				if(copy) {
-					copz = new byte[bytes.length];
-					System.arraycopy(bytes, 0, copz, 0, bytes.length);
-				}
-				cache = copz;
-				return sync();
-			}else {
-				boolean s = AsyncHandlers.writeWholeFile(virtualFilesystem.indexeddb, filePath, TeaVMUtils.unwrapUnsignedByteArray(bytes).getBuffer()).bool;
-				hasBeenAccessed = true;
-				exists = exists || s;
-				return s;
-			}
-		}
-		
-		public boolean sync() {
-			if(cacheEnabled && cache != null && !hasBeenDeleted) {
-				cacheHit = System.currentTimeMillis();
-				boolean tryWrite = AsyncHandlers.writeWholeFile(virtualFilesystem.indexeddb, filePath, TeaVMUtils.unwrapUnsignedByteArray(cache).getBuffer()).bool;
-				hasBeenAccessed = true;
-				exists = exists || tryWrite;
-				return tryWrite;
-			}
-			return false;
-		}
-		
-		public boolean delete() {
-			if(!hasBeenDeleted && !(hasBeenAccessed && !exists)) {
-				cacheHit = System.currentTimeMillis();
-				if(!AsyncHandlers.deleteFile(virtualFilesystem.indexeddb, filePath).bool) {
-					hasBeenAccessed = true;
-					return false;
-				}
-				virtualFilesystem.fileMap.remove(filePath);
-				hasBeenDeleted = true;
-				hasBeenAccessed = true;
-				exists = false;
-				return true;
-			}
-			return false;
-		}
-		
-		public boolean rename(String newName, boolean copy) {
-			if(!hasBeenDeleted && !(hasBeenAccessed && !exists)) {
-				cacheHit = System.currentTimeMillis();
-				ArrayBuffer arr = AsyncHandlers.readWholeFile(virtualFilesystem.indexeddb, filePath);
-				hasBeenAccessed = true;
-				if(arr != null) {
-					exists = true;
-					if(!AsyncHandlers.writeWholeFile(virtualFilesystem.indexeddb, newName, arr).bool) {
-						return false;
-					}
-					if(!copy && !AsyncHandlers.deleteFile(virtualFilesystem.indexeddb, filePath).bool) {
-						return false;
-					}
-				}else {
-					exists = false;
-				}
-				if(!copy) {
-					virtualFilesystem.fileMap.remove(filePath);
-					filePath = newName;
-					virtualFilesystem.fileMap.put(newName, this);
-				}
-				return true;
-			}
-			return false;
-		}
-		
-		public boolean exists() {
-			if(hasBeenDeleted) {
-				return false;
-			}
-			cacheHit = System.currentTimeMillis();
-			if(hasBeenAccessed) {
-				return exists;
-			}
-			exists = AsyncHandlers.fileExists(virtualFilesystem.indexeddb, filePath).bool;
-			hasBeenAccessed = true;
-			return exists;
-		}
-		
-	}
-
-	private final HashMap<String, VFSFile> fileMap = new HashMap();
-	
-	public final String database;
-	private final IDBDatabase indexeddb;
-	
-	public static class VFSHandle {
-		
-		public final boolean failedInit;
-		public final boolean failedLocked;
-		public final String failedError;
-		public final VirtualFilesystem vfs;
-		
-		public VFSHandle(boolean init, boolean locked, String error, VirtualFilesystem db) {
-			failedInit = init;
-			failedLocked = locked;
-			failedError = error;
-			vfs = db;
-		}
-		
-		public String toString() {
-			if(failedInit) {
-				return "IDBFactory threw an exception, IndexedDB is most likely not supported in this browser." + (failedError == null ? "" : "\n\n" + failedError);
-			}
-			if(failedLocked) {
-				return "The filesystem requested is already in use on a different tab.";
-			}
-			if(failedError != null) {
-				return "The IDBFactory.open() request failed, reason: " + failedError;
-			}
-			return "Virtual Filesystem Object: " + vfs.database;
-		}
-		
-	}
-	
-	public static VFSHandle openVFS(String db) {
-		DatabaseOpen evt = AsyncHandlers.openDB(db);
-		if(evt.failedInit) {
-			return new VFSHandle(true, false, evt.failedError, null);
-		}
-		if(evt.failedLocked) {
-			return new VFSHandle(false, true, null, null);
-		}
-		if(evt.failedError != null) {
-			return new VFSHandle(false, false, evt.failedError, null);
-		}
-		return new VFSHandle(false, false, null, new VirtualFilesystem(db, evt.database));
-	}
-	
-	private VirtualFilesystem(String db, IDBDatabase idb) {
-		database = db;
-		indexeddb = idb;
-	}
-	
-	public void close() {
-		indexeddb.close();
-	}
-	
-	public VFSFile getFile(String path) {
-		return getFile(path, false);
-	}
-	
-	public VFSFile getFile(String path, boolean cache) {
-		VFSFile f = fileMap.get(path);
-		if(f == null) {
-			fileMap.put(path, f = new VFSFile(this, path, cache));
-		}else {
-			if(cache) {
-				f.setCacheEnabled();
-			}
-		}
-		return f;
-	}
-	
-	public boolean renameFile(String oldName, String newName, boolean copy) {
-		return getFile(oldName).rename(newName, copy);
-	}
-	
-	public boolean deleteFile(String path) {
-		return getFile(path).delete();
-	}
-	
-	public boolean fileExists(String path) {
-		return getFile(path).exists();
-	}
-	
-	public List<String> listFiles(String prefix) {
-		final ArrayList<String> list = new ArrayList();
-		AsyncHandlers.iterateFiles(indexeddb, this, prefix, false, (v) -> {
-			list.add(v.getPath());
-		});
-		return list;
-	}
-	
-	public int deleteFiles(String prefix) {
-		return AsyncHandlers.deleteFiles(indexeddb, prefix);
-	}
-	
-	public int iterateFiles(String prefix, boolean rw, VFSIterator itr) {
-		return AsyncHandlers.iterateFiles(indexeddb, this, prefix, rw, itr);
-	}
-	
-	public int renameFiles(String oldPrefix, String newPrefix, boolean copy) {
-		List<String> filesToCopy = listFiles(oldPrefix);
-		int i = 0;
-		for(String str : filesToCopy) {
-			String f = VFile.createPath(newPrefix, str.substring(oldPrefix.length()));
-			if(!renameFile(str, f, copy)) {
-				System.err.println("Could not " + (copy ? "copy" : "rename") + " file \"" + str + "\" to \"" + f + "\" for some reason");
-			}else {
-				++i;
-			}
-		}
-		return i;
-	}
-	
-	public void flushCache(long age) {
-		long curr = System.currentTimeMillis();
-		Iterator<VFSFile> files = fileMap.values().iterator();
-		while(files.hasNext()) {
-			if(curr - files.next().cacheHit > age) {
-				files.remove();
-			}
-		}
-	}
-	
-	protected static class DatabaseOpen {
-		
-		protected final boolean failedInit;
-		protected final boolean failedLocked;
-		protected final String failedError;
-		
-		protected final IDBDatabase database;
-		
-		protected DatabaseOpen(boolean init, boolean locked, String error, IDBDatabase db) {
-			failedInit = init;
-			failedLocked = locked;
-			failedError = error;
-			database = db;
-		}
-		
-	}
-	
-	@JSBody(script = "return ((typeof indexedDB) !== 'undefined') ? indexedDB : null;")
-	protected static native IDBFactory createIDBFactory();
-	
-	protected static class AsyncHandlers {
-		
-		@Async
-		protected static native DatabaseOpen openDB(String name);
-		
-		private static void openDB(String name, final AsyncCallback<DatabaseOpen> cb) {
-			IDBFactory i = createIDBFactory();
-			if(i == null) {
-				cb.complete(new DatabaseOpen(false, false, "window.indexedDB was null or undefined", null));
-				return;
-			}
-			final IDBOpenDBRequest f = i.open(name, 1);
-			f.setOnBlocked(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					cb.complete(new DatabaseOpen(false, true, null, null));
-				}
-			});
-			f.setOnSuccess(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					cb.complete(new DatabaseOpen(false, false, null, f.getResult()));
-				}
-			});
-			f.setOnError(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					cb.complete(new DatabaseOpen(false, false, "open error", null));
-				}
-			});
-			f.setOnUpgradeNeeded(new EventListener<IDBVersionChangeEvent>() {
-				@Override
-				public void handleEvent(IDBVersionChangeEvent evt) {
-					f.getResult().createObjectStore("filesystem", IDBObjectStoreParameters.create().keyPath("path"));
-				}
-			});
-		}
-		
-		@Async
-		protected static native BooleanResult deleteFile(IDBDatabase db, String name);
-		
-		private static void deleteFile(IDBDatabase db, String name, final AsyncCallback<BooleanResult> cb) {
-			IDBTransaction tx = db.transaction("filesystem", "readwrite");
-			final IDBRequest r = tx.objectStore("filesystem").delete(makeTheFuckingKeyWork(name));
-			
-			r.setOnSuccess(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					cb.complete(BooleanResult._new(true));
-				}
-			});
-			r.setOnError(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					cb.complete(BooleanResult._new(false));
-				}
-			});
-		}
-		
-		@JSBody(params = { "obj" }, script = "return (typeof obj === 'undefined') ? null : ((typeof obj.data === 'undefined') ? null : obj.data);")
-		protected static native ArrayBuffer readRow(JSObject obj);
-		
-		@JSBody(params = { "obj" }, script = "return [obj];")
-		private static native JSObject makeTheFuckingKeyWork(String k);
-		
-		@Async
-		protected static native ArrayBuffer readWholeFile(IDBDatabase db, String name);
-		
-		private static void readWholeFile(IDBDatabase db, String name, final AsyncCallback<ArrayBuffer> cb) {
-			IDBTransaction tx = db.transaction("filesystem", "readonly");
-			final IDBGetRequest r = tx.objectStore("filesystem").get(makeTheFuckingKeyWork(name));
-			r.setOnSuccess(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					cb.complete(readRow(r.getResult()));
-				}
-			});
-			r.setOnError(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					cb.complete(null);
-				}
-			});
-			
-		}
-		
-		@JSBody(params = { "k" }, script = "return ((typeof k) === \"string\") ? k : (((typeof k) === \"undefined\") ? null : (((typeof k[0]) === \"string\") ? k[0] : null));")
-		private static native String readKey(JSObject k);
-		
-		@JSBody(params = { "k" }, script = "return ((typeof k) === \"undefined\") ? null : (((typeof k.path) === \"undefined\") ? null : (((typeof k.path) === \"string\") ? k[0] : null));")
-		private static native String readRowKey(JSObject r);
-		
-		@Async
-		protected static native Integer iterateFiles(IDBDatabase db, final VirtualFilesystem vfs, final String prefix, boolean rw, final VFSIterator itr);
-		
-		private static void iterateFiles(IDBDatabase db, final VirtualFilesystem vfs, final String prefix, boolean rw, final VFSIterator itr, final AsyncCallback<Integer> cb) {
-			IDBTransaction tx = db.transaction("filesystem", rw ? "readwrite" : "readonly");
-			final IDBCursorRequest r = tx.objectStore("filesystem").openCursor();
-			final int[] res = new int[1];
-			r.setOnSuccess(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					IDBCursor c = r.getResult();
-					if(c == null || c.getKey() == null || c.getValue() == null) {
-						cb.complete(res[0]);
-						return;
-					}
-					String k = readKey(c.getKey());
-					if(k != null) {
-						if(k.startsWith(prefix)) {
-							int ci = res[0]++;
-							try {
-								itr.next(VIteratorFile.create(ci, vfs, c));
-							}catch(VFSIterator.BreakLoop ex) {
-								cb.complete(res[0]);
-								return;
-							}
-						}
-					}
-					c.doContinue();
-				}
-			});
-			r.setOnError(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					cb.complete(res[0] > 0 ? res[0] : -1);
-				}
-			});
-		}
-		
-		@Async
-		protected static native Integer deleteFiles(IDBDatabase db, final String prefix);
-		
-		private static void deleteFiles(IDBDatabase db, final String prefix, final AsyncCallback<Integer> cb) {
-			IDBTransaction tx = db.transaction("filesystem", "readwrite");
-			final IDBCursorRequest r = tx.objectStore("filesystem").openCursor();
-			final int[] res = new int[1];
-			r.setOnSuccess(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					IDBCursor c = r.getResult();
-					if(c == null || c.getKey() == null || c.getValue() == null) {
-						cb.complete(res[0]);
-						return;
-					}
-					String k = readKey(c.getKey());
-					if(k != null) {
-						if(k.startsWith(prefix)) {
-							c.delete();
-							++res[0];
-						}
-					}
-					c.doContinue();
-				}
-			});
-			r.setOnError(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					cb.complete(res[0] > 0 ? res[0] : -1);
-				}
-			});
-		}
-		
-		@Async
-		protected static native BooleanResult fileExists(IDBDatabase db, String name);
-		
-		private static void fileExists(IDBDatabase db, String name, final AsyncCallback<BooleanResult> cb) {
-			IDBTransaction tx = db.transaction("filesystem", "readonly");
-			final IDBCountRequest r = tx.objectStore("filesystem").count(makeTheFuckingKeyWork(name));
-			r.setOnSuccess(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					cb.complete(BooleanResult._new(r.getResult() > 0));
-				}
-			});
-			r.setOnError(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					cb.complete(BooleanResult._new(false));
-				}
-			});
-		}
-		
-		@JSBody(params = { "pat", "dat" }, script = "return { path: pat, data: dat };")
-		protected static native JSObject writeRow(String name, ArrayBuffer data);
-		
-		@Async
-		protected static native BooleanResult writeWholeFile(IDBDatabase db, String name, ArrayBuffer data);
-		
-		private static void writeWholeFile(IDBDatabase db, String name, ArrayBuffer data, final AsyncCallback<BooleanResult> cb) {
-			IDBTransaction tx = db.transaction("filesystem", "readwrite");
-			final IDBRequest r = tx.objectStore("filesystem").put(writeRow(name, data));
-			
-			r.setOnSuccess(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					cb.complete(BooleanResult._new(true));
-				}
-			});
-			r.setOnError(new EventHandler() {
-				@Override
-				public void handleEvent() {
-					cb.complete(BooleanResult._new(false));
-				}
-			});
-		}
-		
-	}
-	
-	public static byte[] utf8(String str) {
-		if(str == null) return null;
-		return str.getBytes(Charset.forName("UTF-8"));
-	}
-	
-	public static String utf8(byte[] str) {
-		if(str == null) return null;
-		return new String(str, Charset.forName("UTF-8"));
-	}
-	
-	public static String CRLFtoLF(String str) {
-		if(str == null) return null;
-		str = str.indexOf('\r') != -1 ? str.replace("\r", "") : str;
-		str = str.trim();
-		if(str.endsWith("\n")) {
-			str = str.substring(0, str.length() - 1);
-		}
-		if(str.startsWith("\n")) {
-			str = str.substring(1);
-		}
-		return str;
-	}
-	
-	public static String[] lines(String str) {
-		if(str == null) return null;
-		return CRLFtoLF(str).split("\n");
-	}
-	
-}
\ No newline at end of file
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/ServerPlatformSingleplayer.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/ServerPlatformSingleplayer.java
index 8ebc44a..c40a051 100755
--- a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/ServerPlatformSingleplayer.java
+++ b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/ServerPlatformSingleplayer.java
@@ -1,7 +1,6 @@
 package net.lax1dude.eaglercraft.v1_8.sp.server.internal;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -73,7 +72,7 @@ public class ServerPlatformSingleplayer {
 	}
 
 	public static void initializeContext() {
-		PlatformFilesystem.initialize();
+		PlatformFilesystem.initialize(getClientConfigAdapter().getWorldsDB());
 	}
 
 	@JSBody(params = { "ch", "dat" }, script = "postMessage({ ch: ch, dat : dat });")